Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12698 from VisualSJ/v3.7-release 

[ci skip] Fixed a bug that action texture address error
This commit is contained in:
pandamicro 2015-07-07 13:57:30 +08:00
parent a41d3847d5 3b69a1726f
commit 701df24301
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/js-bindings/script/studio/jsb_studio_load.js
View File

@ -140,8 +140,8 @@ ccs._parser = cc.Class.extend({
return json["widgetTree"];
},
parse: function(file, json){
var resourcePath = this._dirname(file);
parse: function(file, json, resourcePath){
resourcePath = resourcePath || this._dirname(file);
this.pretreatment(json, resourcePath);
var node = this.parseNode(this.getNodeJson(json), resourcePath, file);
node && this.deferred(json, resourcePath, node, file);