Merge branch 'master' of github.com:cocos-creator/engine into inspector

zilongshanren · Jul 18, 2016 · 118f9fc · 118f9fc
2 parents 2d60ac2 + a66aee3
commit 118f9fc
Show file tree

Hide file tree

Showing 96 changed files with 4,130 additions and 5,359 deletions.
diff --git a/cocos2d/actions/CCActionCamera.js b/cocos2d/actions/CCActionCamera.js
diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js
@@ -25,7 +25,6 @@
 //-------------------------- ClippingNode's canvas render cmd --------------------------------
 cc.ClippingNode.CanvasRenderCmd = function(renderable){
     _ccsg.Node.CanvasRenderCmd.call(this, renderable);
-    this._needDraw = false;
 
     this._rendererClipCmd = new cc.CustomRenderCmd(this, this._drawStencilCommand);
     this._rendererRestoreCmd = new cc.CustomRenderCmd(this, this._restoreCmdCallback);