Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal

Conflicts:
	js/lib/geom/circle.js
	js/lib/rdge/materials/linear-gradient-material.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index eed9e79a..35ae980a 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -86,6 +86,15 @@ var JuliaMaterial = function JuliaMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////