Skip to content

Commit 8d8c200

Browse files
committed
Update -x timeline and parser
1 parent 51af269 commit 8d8c200

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
blendFunc.src = blendData["Src"];
189189
if (blendData["Dst"] !== undefined)
190190
blendFunc.dst = blendData["Dst"];
191-
node.setBlendFunc(new cc.BlendFunc());
191+
node.setBlendFunc(blendFunc);
192192
}
193193

194194
if(json["FlipX"])

extensions/cocostudio/timeline/ActionTimeline.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ ccs.ObjectExtensionData = ccs.Class.extend({
6666
_timelineData: null,
6767

6868
ctor: function(){
69-
this._init();
70-
},
71-
72-
_init: function(){
7369
this._timelineData = new ccs.ActionTimelineData(0);
7470
return true;
7571
},
@@ -84,8 +80,7 @@ ccs.ObjectExtensionData = ccs.Class.extend({
8480
});
8581

8682
ccs.ObjectExtensionData.create = function(){
87-
var ret = new ccs.ObjectExtensionData();
88-
return ret;
83+
return new ccs.ObjectExtensionData();
8984
};
9085

9186
/**

0 commit comments

Comments
 (0)