Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/MaterialsLibrary.js

1 files changed, 22 insertions, 20 deletions

diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index 5f82a996..9616b525 100644
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -169,29 +169,31 @@ var MaterialsLibrary = Object.create(Object.prototype, {
 
 // create the library of stroke and fill materials
 
+var flatMaterial                                = new FlatMaterial();
 var uberMaterial                                = new UberMaterial();
-var linearGradientMaterial              = new LinearGradientMaterial();
-var radialGradientMaterial              = new RadialGradientMaterial();
-var radialBlurMaterial                  = new RadialBlurMaterial();
-var pulseMaterial                               = new PulseMaterial();
-var tunnelMaterial                              = new TunnelMaterial();
-var twistMaterial                               = new TwistMaterial();
-var keleidoscopeMaterial                = new KeleidoscopeMaterial();
-var juliaMaterial                               = new JuliaMaterial();
-var mandelMaterial                              = new MandelMaterial();
-var plasmaMaterial                              = new PlasmaMaterial();
+//var linearGradientMaterial            = new LinearGradientMaterial();
+//var radialGradientMaterial            = new RadialGradientMaterial();
+//var radialBlurMaterial                        = new RadialBlurMaterial();
+//var pulseMaterial                             = new PulseMaterial();
+//var tunnelMaterial                            = new TunnelMaterial();
+//var twistMaterial                             = new TwistMaterial();
+//var keleidoscopeMaterial              = new KeleidoscopeMaterial();
+//var juliaMaterial                             = new JuliaMaterial();
+//var mandelMaterial                            = new MandelMaterial();
+//var plasmaMaterial                            = new PlasmaMaterial();
 var bumpMetalMaterial                   = new BumpMetalMaterial();
 
-MaterialsLibrary.addMaterial(linearGradientMaterial);
-MaterialsLibrary.addMaterial(radialGradientMaterial);
-MaterialsLibrary.addMaterial(radialBlurMaterial);
-MaterialsLibrary.addMaterial(pulseMaterial);
-MaterialsLibrary.addMaterial(tunnelMaterial);
-MaterialsLibrary.addMaterial(twistMaterial);
-MaterialsLibrary.addMaterial(keleidoscopeMaterial);
-MaterialsLibrary.addMaterial(juliaMaterial);
-MaterialsLibrary.addMaterial(mandelMaterial);
-MaterialsLibrary.addMaterial(plasmaMaterial);
+MaterialsLibrary.addMaterial(flatMaterial);
+//MaterialsLibrary.addMaterial(linearGradientMaterial);
+//MaterialsLibrary.addMaterial(radialGradientMaterial);
+//MaterialsLibrary.addMaterial(radialBlurMaterial);
+//MaterialsLibrary.addMaterial(pulseMaterial);
+//MaterialsLibrary.addMaterial(tunnelMaterial);
+//MaterialsLibrary.addMaterial(twistMaterial);
+//MaterialsLibrary.addMaterial(keleidoscopeMaterial);
+//MaterialsLibrary.addMaterial(juliaMaterial);
+//MaterialsLibrary.addMaterial(mandelMaterial);
+//MaterialsLibrary.addMaterial(plasmaMaterial);
 MaterialsLibrary.addMaterial(bumpMetalMaterial);
 MaterialsLibrary.addMaterial(uberMaterial);