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/taper-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/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"; |