Merge pull request #1561 from pandamicro/develop

pandamicro · pandamicro · commit 6b5e8bc58463 · 2015-03-19T09:56:03.000+08:00
Fix armature setBlendFunc parameter inconsistency
diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
@@ -1 +1 @@
-Subproject commit f1594e670cf263877f5e4e07452321449683f8e2
+Subproject commit f0311f25c3c37d180caa1b9f799478d8106aa2b5
diff --git a/frameworks/js-bindings/bindings/manual/ScriptingCore.h b/frameworks/js-bindings/bindings/manual/ScriptingCore.h
@@ -39,7 +39,7 @@
 #include <assert.h>
 #include <memory>
 
-#define ENGINE_VERSION "Cocos2d-JS v3.3"
+#define ENGINE_VERSION "Cocos2d-JS v3.4 Beta0"
 
 void js_log(const char *format, ...);
 
diff --git a/frameworks/js-bindings/bindings/script/jsb_cocos2d.js b/frameworks/js-bindings/bindings/script/jsb_cocos2d.js
@@ -26,7 +26,7 @@
 
 // CCConfig.js
 //
-cc.ENGINE_VERSION = "Cocos2d-JS v3.3";
+cc.ENGINE_VERSION = "Cocos2d-JS v3.4 Beta0";
 
 cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
 cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
@@ -2172,7 +2172,6 @@ var templateSetBlendFunc = function(src, dst) {
     else
         blendf = {src: src, dst: dst};
     this._setBlendFunc(blendf);
-    var b = this.getBlendFunc();
 };
 for (var i = 0, l = protoHasBlend.length; i < l; i++) {
     var proto = protoHasBlend[i];
diff --git a/frameworks/js-bindings/bindings/script/studio/jsb_cocos2d_studio.js b/frameworks/js-bindings/bindings/script/studio/jsb_cocos2d_studio.js
@@ -63,6 +63,9 @@ if(ccs.Armature){
   ccs.Armature.extend = cc.Class.extend;
 }
 
+ccs.Armature.prototype._setBlendFunc = ccs.Armature.prototype.setBlendFunc;
+ccs.Armature.prototype.setBlendFunc = templateSetBlendFunc;
+
 
 ccs.sendEvent = function (event) {
     var triggerObjArr = ccs.triggerManager.get(event);
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
@@ -1 +1 @@
-Subproject commit 3b31387fb67c934b080bd777109103eb0ba04746
+Subproject commit e3a9c52c5452dc6a3287c9d340f74355842cc44c

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ if(ccs.Armature){`
`63`	`63`	`ccs.Armature.extend = cc.Class.extend;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ccs.Armature.prototype._setBlendFunc = ccs.Armature.prototype.setBlendFunc;`
	`67`	`+ccs.Armature.prototype.setBlendFunc = templateSetBlendFunc;`
	`68`	`+`
`66`	`69`
`67`	`70`	`ccs.sendEvent = function (event) {`
`68`	`71`	`var triggerObjArr = ccs.triggerManager.get(event);`