diff options
author | Jose Antonio Marquez | 2012-03-09 10:13:59 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-09 10:13:59 -0800 |
commit | d549383abf18a0dc54a990983fb4296602b66120 (patch) | |
tree | ac107d3823abb846c1afae3d03abce0f6aae2c98 /js/lib/rdge/materials/radial-blur-material.js | |
parent | 3bcdfaa322ac53609b66ecedbace1872048fd310 (diff) | |
parent | 7b6e8194b91168abdeb94702eb350d14f147858b (diff) | |
download | ninja-d549383abf18a0dc54a990983fb4296602b66120.tar.gz |
Merge branch 'refs/heads/integration' into FileIO-Integration
Conflicts:
js/document/html-document.js
Diffstat (limited to 'js/lib/rdge/materials/radial-blur-material.js')
-rw-r--r-- | js/lib/rdge/materials/radial-blur-material.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js index d0d05e8d..f23f0712 100644 --- a/js/lib/rdge/materials/radial-blur-material.js +++ b/js/lib/rdge/materials/radial-blur-material.js | |||
@@ -162,7 +162,11 @@ var RadialBlurMaterial = function RadialBlurMaterial() { | |||
162 | var exportStr = "material: " + this.getShaderName() + "\n"; | 162 | var exportStr = "material: " + this.getShaderName() + "\n"; |
163 | exportStr += "name: " + this.getName() + "\n"; | 163 | exportStr += "name: " + this.getName() + "\n"; |
164 | 164 | ||
165 | var texMapName = this._propValues[this._propNames[0]]; | 165 | var world = this.getWorld(); |
166 | if (!world) | ||
167 | throw new Error( "no world in material.export, " + this.getName() ); | ||
168 | |||
169 | var texMapName = world.cleansePath( this._propValues[this._propNames[0]] ); | ||
166 | exportStr += "texture: " + texMapName + "\n"; | 170 | exportStr += "texture: " + texMapName + "\n"; |
167 | 171 | ||
168 | // every material needs to terminate like this | 172 | // every material needs to terminate like this |