diff options
author | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
commit | 7d4d8651d059a91d29142d7f07d3122eb64532fa (patch) | |
tree | 6f180ddb9f631b49271670771144759c39f3c919 /js/lib/rdge/materials/radial-blur-material.js | |
parent | 94ddbc239965cb39431708e78dde5127c64b0060 (diff) | |
parent | 615be47750fb86c07acd9354da12a76abe6c24e0 (diff) | |
download | ninja-7d4d8651d059a91d29142d7f07d3122eb64532fa.tar.gz |
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
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..46cdda74 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 = 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 |