Merge branch 'Iss2416_RefactorRenderer' of https://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer

dingpinglv · dingpinglv · commit cf9ba677b772 · 2014-12-08T17:32:25.000+08:00
diff --git a/cocos2d/node-grid/CCNodeGrid.js b/cocos2d/node-grid/CCNodeGrid.js
@@ -104,7 +104,7 @@ cc.NodeGrid = cc.Node.extend({
         if (cc._renderType === cc._RENDER_TYPE_WEBGL)
             return new cc.NodeGrid.WebGLRenderCmd(this);
         else
-            return null;            // cc.NodeGrid doesn't support Canvas mode.
+            return new cc.Node.CanvasRenderCmd(this);            // cc.NodeGrid doesn't support Canvas mode.
     }
 });
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ cc.NodeGrid = cc.Node.extend({`
`104`	`104`	`if (cc._renderType === cc._RENDER_TYPE_WEBGL)`
`105`	`105`	`return new cc.NodeGrid.WebGLRenderCmd(this);`
`106`	`106`	`else`
`107`		`- return null; // cc.NodeGrid doesn't support Canvas mode.`
	`107`	`+ return new cc.Node.CanvasRenderCmd(this); // cc.NodeGrid doesn't support Canvas mode.`
`108`	`108`	`}`
`109`	`109`	`});`
`110`	`110`