Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 13 insertions, 0 deletions

diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
index 9acb4213..a5fb134c 100644
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -37,6 +37,8 @@ function RadialBlurMaterial()
         this.getTextureMap                      = function()            {  return this._texMap.slice(0);        }
         this.setTextureMap                      = function(m)           {  this._propValues[this._propNames[0]] = m.slice(0);  this.updateTexture();    }       
 
+        this.isAnimated                         = function()            {  return true;         }
+
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -190,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;
         }