aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/flat-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-15 06:28:46 -0700
committerJose Antonio Marquez2012-03-15 06:28:46 -0700
commitd244f628723399422bb7068bda528bcc0e14c53c (patch)
treea270ef244f81c58d5d1ac9ae65ec55dfdfba36fa /js/lib/rdge/materials/flat-material.js
parent7a9e7ff2e113c95aada64cfccbc140fa77599d57 (diff)
parent67748b4fb19cd5fd210ca711c98d992371c4d2d3 (diff)
downloadninja-d244f628723399422bb7068bda528bcc0e14c53c.tar.gz
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index 97e4f646..fff0e68e 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -102,13 +102,7 @@ var FlatMaterial = function FlatMaterial() {
102 try 102 try
103 { 103 {
104 var color = eval( "[" + pu.nextValue( "color: " ) + "]" ); 104 var color = eval( "[" + pu.nextValue( "color: " ) + "]" );
105
106 this.setProperty( "color", color); 105 this.setProperty( "color", color);
107
108 var endKey = "endMaterial\n";
109 var index = importStr.indexOf( endKey );
110 index += endKey.length;
111 rtnStr = importStr.substr( index );
112 } 106 }
113 catch (e) 107 catch (e)
114 { 108 {