Merge pull request #1702 from pandamicro/v1.5

Fix AssetLibrary.loadJson
This commit is contained in:
Wang Nan
2017-06-06 10:12:43 +08:00
committed by GitHub
+1 -1
View File
@@ -212,7 +212,7 @@ var AssetLibrary = {
uuid: randomUuid,
type: 'uuid',
content: json,
skips: [ Loader.downloader.id ]
skips: [ Loader.assetLoader.id, Loader.downloader.id ]
};
Loader.load(item, function (error, asset) {
if (error) {