Merge pull request cocos2d#2900 from VisualSJ/develop-ScrollView

Fixed texture is not update

Author: pandamicro

cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js

@@ -203,7 +203,10 @@
             if (displayedColor.r === 255 && displayedColor.g === 255 && displayedColor.b === 255) {
                 if (this._colorized) {
                     this._colorized = false;
-                    node.texture = this._originalTexture;
+                    var rect = cc.rect(node._rect);
+                    var isRotation = node._rectRotated;
+                    node.setTexture(this._originalTexture);
+                    node.setTextureRect(rect, isRotation);
                 }
                 return;
             }

extensions/ccui/layouts/UILayoutCanvasRenderCmd.js

@@ -133,7 +133,6 @@
 
         this._clipElemType = node._stencil instanceof cc.Sprite;
         this._syncStatus(parentCmd);
-        this._dirtyFlag = 0;
 
         cc.renderer.pushRenderCommand(this._rendererSaveCmd);
         if (this._clipElemType) {
@@ -171,6 +170,7 @@
                 locProtectChildren[j].visit(this);
             cc.renderer.pushRenderCommand(this._rendererRestoreCmd);
         }
+        this._dirtyFlag = 0;
     };
 
     ccui.Layout.CanvasRenderCmd._getSharedCache = function () {