Merge branch 'refs/heads/master' into components

Conflicts:
	js/components/treeview/ninja-leaf.reel/ninja-leaf.js

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

1 files changed, 2 insertions, 12 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index afdc3628..62ca5395 100644
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -236,21 +236,11 @@ exports.MaterialsPopup = Montage.create(Component, {
                 {
            this._materialName = materialID;
             if( 
-                                        (materialID === "BrickMaterial")                                ||
-                                        (materialID ===  "UberMaterial")                                || 
+                                        (materialID ===  "UberMaterial")                                ||
                                         (materialID ===  "FlatMaterial")                                ||
                                         (materialID ===  "BumpMetalMaterial")                   ||
-                                        (materialID ===  "PlasmaMaterial")                              ||
                                         (materialID ===  "LinearGradientMaterial")              ||
-                                        (materialID ===  "RadialGradientMaterial")              ||
-                                        (materialID ===  "RadialBlurMaterial")                  ||
-                                        (materialID ===  "PulseMaterial")                               ||
-                                        (materialID ===  "TunnelMaterial")                              ||
-                                        (materialID ===  "TwistMaterial")                               ||
-                                        (materialID ===  "KeleidoscopeMaterial")                ||
-                                        (materialID ===  "JuliaMaterial")                               ||
-                                        (materialID ===  "MandelMaterial")                              ||
-                                        (materialID ===  "IridescentScalesMaterial")
+                                        (materialID ===  "RadialGradientMaterial")
                                 )
                         {
                                 var material = MaterialsLibrary.getMaterial( materialID );