Merge pull request #3516 from pandamicro/develop

pandamicro · web-flow · commit 263352a1fca7 · 2017-09-08T14:57:22.000+08:00
Fix glProgramState undefined issue in DrawingPrimitives
diff --git a/cocos2d/core/CCDrawingPrimitivesWebGL.js b/cocos2d/core/CCDrawingPrimitivesWebGL.js
@@ -61,6 +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._initialized = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +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`	`65`
`65`	`66`	`_t._initialized = true;`
`66`	`67`	`}`