diff options
author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | |
parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/scenegraphNodes.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | 2 |
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 | ||