diff options
author | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
commit | 6bb00e69713bd7131b2bc0a15e4e0cb6071d616c (patch) | |
tree | 08d43d3c3a6777032ce51c503947874c02bf3947 /js/helper-classes/RDGE/GLMaterial.js | |
parent | 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 (diff) | |
parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
download | ninja-6bb00e69713bd7131b2bc0a15e4e0cb6071d616c.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/helper-classes/RDGE/GLMaterial.js')
-rw-r--r-- | js/helper-classes/RDGE/GLMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js index c633f679..e72b7908 100644 --- a/js/helper-classes/RDGE/GLMaterial.js +++ b/js/helper-classes/RDGE/GLMaterial.js | |||
@@ -215,7 +215,7 @@ function GLMaterial( world ) | |||
215 | var endKey = "endMaterial\n"; | 215 | var endKey = "endMaterial\n"; |
216 | var index = importStr.indexOf( endKey ); | 216 | var index = importStr.indexOf( endKey ); |
217 | index += endKey.length; | 217 | index += endKey.length; |
218 | rtnStr = importStr.substr( index ); | 218 | var rtnStr = importStr.substr( index ); |
219 | 219 | ||
220 | return rtnStr; | 220 | return rtnStr; |
221 | } | 221 | } |