Merge pull request #3519 from pandamicro/develop

pandamicro · web-flow · commit 8cc2b2e790ce · 2017-09-08T16:30:57.000+08:00
Fix infinite call stack in ArmatureWebGLRenderCmd
diff --git a/cocos2d/core/CCDrawingPrimitivesWebGL.js b/cocos2d/core/CCDrawingPrimitivesWebGL.js
@@ -61,7 +61,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
             _t._shader = cc.shaderCache.programForKey(cc.SHADER_POSITION_UCOLOR);
             _t._shader._addUniformLocation(this._colorLocation);
             _t._shader._addUniformLocation(this._pointSizeLocation);
-            _t._glProgramState = new cc.GLProgramState(_t._shader);
+            _t._glProgramState = cc.GLProgramState.getOrCreateWithGLProgram(_t._shader);
 
             _t._initialized = true;
         }
diff --git a/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js b/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
@@ -118,7 +118,7 @@
     };
 
     proto.setShaderProgram = function (shaderProgram) {
-        this._shaderProgram = shaderProgram;
+        this._glProgramState = cc.GLProgramState.getOrCreateWithGLProgram(shaderProgram);
     };
 
     proto._updateColorAndOpacity = function (skinRenderCmd, bone) {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#`
`61`	`61`	`_t._shader = cc.shaderCache.programForKey(cc.SHADER_POSITION_UCOLOR);`
`62`	`62`	`_t._shader._addUniformLocation(this._colorLocation);`
`63`	`63`	`_t._shader._addUniformLocation(this._pointSizeLocation);`
`64`		`- _t._glProgramState = new cc.GLProgramState(_t._shader);`
	`64`	`+ _t._glProgramState = cc.GLProgramState.getOrCreateWithGLProgram(_t._shader);`
`65`	`65`
`66`	`66`	`_t._initialized = true;`
`67`	`67`	`}`