aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-09 15:26:27 -0800
committerJose Antonio Marquez Russo2012-03-09 15:26:27 -0800
commit165c4bc09d0abc58af4daaafd293d41641cabaa0 (patch)
treedadc3d9853c5877434191259bdfec3a352564d13 /js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
parent143c2b73c5a61e4bf1fe19884823c21a281d9ace (diff)
parent9e048d2cf359c305e895fe7c0bebf09016896531 (diff)
downloadninja-165c4bc09d0abc58af4daaafd293d41641cabaa0.tar.gz
Merge pull request #33 from ericmueller/integration
Integration
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