diff options
author | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
commit | af4b43723df785c946abae90d44269e819d55d71 (patch) | |
tree | 761159dc0056354c231d3bfb4f851bfdcea4b462 /js/lib/rdge/materials/pulse-material.js | |
parent | 5da69dfd30f353ff753cba9322744e2f33f32a1a (diff) | |
parent | e92a6da7b84c58803489d70efedf74837ddfe4cd (diff) | |
download | ninja-af4b43723df785c946abae90d44269e819d55d71.tar.gz |
Merge pull request #32 from ericmueller/integration
Added asset folder replacement to runtime load.
Diffstat (limited to 'js/lib/rdge/materials/pulse-material.js')
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 8ad78bd4..81db36c6 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
@@ -183,7 +183,7 @@ var PulseMaterial = function PulseMaterial() { | |||
183 | if (!world) | 183 | if (!world) |
184 | throw new Error( "no world in material.export, " + this.getName() ); | 184 | throw new Error( "no world in material.export, " + this.getName() ); |
185 | 185 | ||
186 | var texMapName = world.cleansePath( this._propValues[this._propNames[0]] ); | 186 | var texMapName = this._propValues[this._propNames[0]]; |
187 | exportStr += "texture: " +texMapName + "\n"; | 187 | exportStr += "texture: " +texMapName + "\n"; |
188 | 188 | ||
189 | // every material needs to terminate like this | 189 | // every material needs to terminate like this |