Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
index e80a14fb..93ee12bf 100755
--- a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
+++ b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
@@ -336,7 +336,7 @@ materialNodeTemplate = function(matNode)
         matNode.setTexture = function(texType, texName)

         {

                 var renderer = g_Engine.getContext().renderer;

-                this.textureList[texType].handle = renderer.getTextureByName("assets/images/" + texName);

+                this.textureList[texType].handle = renderer.getTextureByName(g_Engine._assetPath+"/images/" + texName);

             this.textureList[texType].unit = texType;

                 this.textureList[texType].type = UNIFORMTYPE.TEXTURE2D;