diff options
| author | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
| commit | 49e4c8695941f6bdd15893534ffb3ccce92c5396 (patch) | |
| tree | 9e8327be823441717ad44684d0e3714c56116f39 /js/lib/rdge/materials/taper-material.js | |
| parent | 9ab4b4306343ec2a20094c7626abb524b7720ce8 (diff) | |
| parent | 242bddd5b64c4a5226daa2f4caa10bf63c56403a (diff) | |
| download | ninja-49e4c8695941f6bdd15893534ffb3ccce92c5396.tar.gz | |
Merge branch 'refs/heads/FileIO-Integration' into FileIO
Diffstat (limited to 'js/lib/rdge/materials/taper-material.js')
| -rw-r--r-- | js/lib/rdge/materials/taper-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js index bd89f08f..03a7ba9c 100644 --- a/js/lib/rdge/materials/taper-material.js +++ b/js/lib/rdge/materials/taper-material.js | |||
| @@ -104,7 +104,7 @@ function TaperMaterial() | |||
| 104 | exportStr += "name: " + this.getName() + "\n"; | 104 | exportStr += "name: " + this.getName() + "\n"; |
| 105 | 105 | ||
| 106 | if (this._shader) | 106 | if (this._shader) |
| 107 | exportStr += "color: " + String(this._shader.colorMe.color) + "\n"; | 107 | exportStr += "color: " + this._shader.colorMe.color + "\n"; |
| 108 | else | 108 | else |
| 109 | exportStr += "color: " + this.getColor() + "\n"; | 109 | exportStr += "color: " + this.getColor() + "\n"; |
| 110 | exportStr += "endMaterial\n"; | 110 | exportStr += "endMaterial\n"; |