Merge pull request #3402 from DavidDeSimone/spine-blendfunc-parity

pandamicro · web-flow · commit 078600de8dad · 2016-11-04T13:28:29.000+08:00
WebGL spine defaults to different blend func than native
diff --git a/extensions/spine/CCSkeletonWebGLRenderCmd.js b/extensions/spine/CCSkeletonWebGLRenderCmd.js
@@ -103,7 +103,7 @@
                     cc.glBlendFunc(cc.ONE, cc.ONE_MINUS_SRC_COLOR);
                     break;
                 default:
-                    cc.glBlendFunc(locBlendFunc.src, locBlendFunc.dst);
+                    cc.glBlendFunc(premultiAlpha ? cc.ONE : cc.SRC_ALPHA, cc.ONE_MINUS_SRC_ALPHA);
                 }
             } else if (regionTextureAtlas != textureAtlas && textureAtlas) {
                 textureAtlas.drawQuads();

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@`
`103`	`103`	`cc.glBlendFunc(cc.ONE, cc.ONE_MINUS_SRC_COLOR);`
`104`	`104`	`break;`
`105`	`105`	`default:`
`106`		`- cc.glBlendFunc(locBlendFunc.src, locBlendFunc.dst);`
	`106`	`+ cc.glBlendFunc(premultiAlpha ? cc.ONE : cc.SRC_ALPHA, cc.ONE_MINUS_SRC_ALPHA);`
`107`	`107`	`}`
`108`	`108`	`} else if (regionTextureAtlas != textureAtlas && textureAtlas) {`
`109`	`109`	`textureAtlas.drawQuads();`