Merge pull request cocos2d#3162 from pandamicro/develop

Fix webgl sync status issue on Node and LabelTTF

Author: pandamicro

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -341,8 +341,7 @@ cc.Node.RenderCmd.prototype = {
             locFlag |= flags.transformDirty;
 
         var colorDirty = locFlag & flags.colorDirty,
-            opacityDirty = locFlag & flags.opacityDirty,
-            transformDirty = locFlag & flags.transformDirty;
+            opacityDirty = locFlag & flags.opacityDirty;
 
         this._dirtyFlag = locFlag;
 
@@ -357,7 +356,7 @@ cc.Node.RenderCmd.prototype = {
         if(colorDirty)
             this._updateColor();
 
-        if (transformDirty)
+        if (cc._renderType === cc.game.RENDER_TYPE_WEBGL || locFlag & flags.transformDirty)
             //update the transform
             this.transform(parentCmd);
     },

cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

@@ -334,7 +334,7 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
         }else if(locFlag & flags.textDirty)
             this._updateTexture();
 
-        if (locFlag & flags.transformDirty)                 //update the transform
+        if (cc._renderType === cc.game.RENDER_TYPE_WEBGL || locFlag & flags.transformDirty)
             this.transform(parentCmd);
     };