diff --git a/VERSION b/VERSION index ab4bf870fb5..e0b25d39b30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.177.0-dev +0.178.1-dev diff --git a/src/framework/components/audiosource/audiosource_component.js b/src/framework/components/audiosource/audiosource_component.js index 3139d001352..037c133bb4a 100644 --- a/src/framework/components/audiosource/audiosource_component.js +++ b/src/framework/components/audiosource/audiosource_component.js @@ -234,13 +234,15 @@ pc.extend(pc, function () { // load assets that haven't been loaded yet var assets = this.data.assets; if (assets) { + var registry = this.system.app.assets; + for (var i = 0, len = assets.length; i < len; i++) { var asset = assets[i]; if (! (asset instanceof pc.Asset)) - asset = this.system.app.assets.get(asset); + asset = registry.get(asset); if (asset && !asset.resource) { - this.system.app.assets.load(asset); + registry.load(asset); } } } diff --git a/src/resources/resources_texture.js b/src/resources/resources_texture.js index cdc4755e18c..e4da6a23559 100644 --- a/src/resources/resources_texture.js +++ b/src/resources/resources_texture.js @@ -67,8 +67,7 @@ pc.extend(pc, function () { // Call error callback with details. image.onerror = function (event) { - var element = event.srcElement; - callback(pc.string.format("Error loading Texture from: '{0}'", element.src)); + callback(pc.string.format("Error loading Texture from: '{0}'", url)); }; image.src = url; diff --git a/src/scene/scene_forwardrenderer.js b/src/scene/scene_forwardrenderer.js index f57a6af021f..c957347a5ea 100644 --- a/src/scene/scene_forwardrenderer.js +++ b/src/scene/scene_forwardrenderer.js @@ -684,7 +684,7 @@ pc.extend(pc, function () { for (i = 0; i < drawCallsCount; i++) { drawCall = drawCalls[i]; - if (!drawCall.command && drawCall.drawToDepth) { + if (!drawCall.command && drawCall.drawToDepth && meshInstance.material.blendType===pc.BLEND_NONE) { meshInstance = drawCall; mesh = meshInstance.mesh;