aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/renderer.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/renderer.js
parent730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff)
parent9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff)
downloadninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/renderer.js')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/renderer.js1
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) {
338 if (tex === undefined) 338 if (tex === undefined)
339 { 339 {
340 // load the texture 340 // load the texture
341 name = g_Engine.remapAssetFolder( name );
341 tex = this.createTexture(name + ext, wrap, mips); 342 tex = this.createTexture(name + ext, wrap, mips);
342 this.textureMap[name] = tex; 343 this.textureMap[name] = tex;
343 tex.lookUpName = name; 344 tex.lookUpName = name;