Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 1 insertions, 0 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index a50b8a68..c01068a4 100755
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -338,6 +338,7 @@ _renderer = function(canvas) {
         if (tex === undefined)

                 {

             // load the texture

+                        name = g_Engine.remapAssetFolder( name );

             tex = this.createTexture(name + ext, wrap, mips);

             this.textureMap[name] = tex;

             tex.lookUpName = name;