Skip to content

Commit 763fe68

Browse files
committed
Merge pull request cocos2d#2974 from VisualSJ/develop-20771
Fixed a bug that action texture address error
2 parents 7edcc89 + 8f3efcd commit 763fe68

File tree

1 file changed

+2
-2
lines changed
  • extensions/cocostudio/loader

1 file changed

+2
-2
lines changed

extensions/cocostudio/loader/load.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ ccs._parser = cc.Class.extend({
140140
return json["widgetTree"];
141141
},
142142

143-
parse: function(file, json){
144-
var resourcePath = this._dirname(file);
143+
parse: function(file, json, resourcePath){
144+
resourcePath = resourcePath || this._dirname(file);
145145
this.pretreatment(json, resourcePath);
146146
var node = this.parseNode(this.getNodeJson(json), resourcePath, file);
147147
node && this.deferred(json, resourcePath, node, file);

0 commit comments

Comments
 (0)