aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:24:35 -0700
committerPushkar Joshi2012-03-13 11:24:35 -0700
commit4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch)
tree0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
parent730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff)
parent9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff)
downloadninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/scenegraphNodes.js')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraphNodes.js2
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)
336 matNode.setTexture = function(texType, texName) 336 matNode.setTexture = function(texType, texName)
337 { 337 {
338 var renderer = g_Engine.getContext().renderer; 338 var renderer = g_Engine.getContext().renderer;
339 this.textureList[texType].handle = renderer.getTextureByName("assets/images/" + texName); 339 this.textureList[texType].handle = renderer.getTextureByName(g_Engine._assetPath+"/images/" + texName);
340 this.textureList[texType].unit = texType; 340 this.textureList[texType].unit = texType;
341 this.textureList[texType].type = UNIFORMTYPE.TEXTURE2D; 341 this.textureList[texType].type = UNIFORMTYPE.TEXTURE2D;
342 342