Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js
index a74a74e4..642fab05 100644
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -226,7 +226,7 @@ function GLMaterial( world )
                 var endKey = "endMaterial\n";
                 var index = importStr.indexOf( endKey );
                 index += endKey.length;
-                rtnStr = importStr.substr( index );
+                var rtnStr = importStr.substr( index );
 
                 return rtnStr;
         }