diff options
author | Eric Guzman | 2012-03-16 15:09:09 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-16 15:09:09 -0700 |
commit | f08e3660384ed6ed2ba8ecf959c90fd1ade818eb (patch) | |
tree | 49c36caa1f0cf7e5ff8ca9239609965aa1b7a8e5 /js/lib/rdge/materials/flat-material.js | |
parent | 4afb01e3b8261ab5e9492bfc63ad17e44dfcb934 (diff) | |
parent | 3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff) | |
download | ninja-f08e3660384ed6ed2ba8ecf959c90fd1ade818eb.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-x | js/lib/rdge/materials/flat-material.js | 6 |
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 | { |