Merge pull request #174 from pandamicro/v0.7

Fix AssetLibrary mistake
This commit is contained in:
pandamicro
2015-12-30 23:33:59 +08:00
+1 -4
View File
@@ -373,16 +373,13 @@ var AssetLibrary = {
return;
}
else if (isRawAsset) {
cc.loader.loadImg(dependsUrl, function (err, assets) {
cc.loader.load(dependsUrl, function (err, assets) {
if (err) {
cc.error('[AssetLibrary] Failed to load "%s"', dependsUrl);
obj[prop] = '';
}
else {
obj[prop] = dependsUrl;
if (!cc.sys.isNative) {
cc.textureCache.handleLoadedTexture(dependsUrl);
}
}
--pendingCount;
if (callback && pendingCount === 0) {