Merge "fix drawWithOpengl"