Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/preloader/Preloader.js

2 files changed, 22 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/Materials/PulseMaterial.js b/js/helper-classes/RDGE/Materials/PulseMaterial.js
index 6f7e9fe0..d76b9966 100644
--- a/js/helper-classes/RDGE/Materials/PulseMaterial.js
+++ b/js/helper-classes/RDGE/Materials/PulseMaterial.js
@@ -200,7 +200,17 @@ function PulseMaterial()
                 this.setName(  pu.nextValue( "name: ") );
 
                 var rtnStr;
-                
+        try
+        {
+            var endKey = "endMaterial\n";
+            var index = importStr.indexOf( endKey );
+            index += endKey.length;
+            rtnStr = importStr.substr( index );
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
                 return rtnStr;
         }
 }
diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
index 732800cf..a5fb134c 100644
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -192,6 +192,17 @@ function RadialBlurMaterial()
                 this.setName(  pu.nextValue( "name: ") );
 
                 var rtnStr;
+        try
+        {
+            var endKey = "endMaterial\n";
+            var index = importStr.indexOf( endKey );
+            index += endKey.length;
+            rtnStr = importStr.substr( index );
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
                 
                 return rtnStr;
         }