diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/helper-classes/RDGE/src/core/script/renderer.js | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/renderer.js')
| -rwxr-xr-x | js/helper-classes/RDGE/src/core/script/renderer.js | 1 |
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; |