Merge branch 'pentool' into brushtool

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

1 files changed, 17 insertions, 42 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..508b8130 100644..100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -11,36 +11,13 @@ var Button = 			require("js/components/button.reel").Button;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
 exports.MaterialsPopup = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-    okButton: {
-        enumerable: false,
-        value: null
-    },
-
-    cancelButton: {
-        enumerable: false,
-        value: null
-    },
-
     ////////////////////////////////////////////////////////////////////
         // Material Properties
-
-    materialsProperties: {
-        enumerable: true,
-        serializable: true,
-        value: null
-    },
-
     _materialName: {
         enumerable: true,
-        value: "Material"
+        value: ""
     },
 
-        materialTitle: {
-                enumerable: true,
-                value: null
-        },
-
         captureAction: {
                 value:function(event) {
                         switch(event._currentTarget.label)
@@ -69,6 +46,9 @@ exports.MaterialsPopup = Montage.create(Component, {
                     }
                                         break;
                         }
+
+            // Notify Materials Library to close popup
+            NJevent("hideMaterialPopup");
                 }
         },
 
@@ -235,22 +215,12 @@ exports.MaterialsPopup = Montage.create(Component, {
                 value: function(materialID)
                 {
            this._materialName = materialID;
-            if( 
-                                        (materialID === "BrickMaterial")                                ||
-                                        (materialID ===  "UberMaterial")                                || 
+            if(
+                                        (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 ===  "BumpMetalMaterial")                   ||
+                                        (materialID ===  "LinearGradientMaterial")              ||
+                                        (materialID ===  "RadialGradientMaterial")
                                 )
                         {
                                 var material = MaterialsLibrary.getMaterial( materialID );
@@ -333,6 +303,8 @@ exports.MaterialsPopup = Montage.create(Component, {
         {
                 value:  function( label,  color )
                 {
+            var css = 'rgba(' + color[0]*255 + ',' + color[1]*255 + ',' + color[2]*255 + ',' + color[3] + ')';
+            var colorObj = this.application.ninja.colorController.getColorObjFromCss(css)
                         var obj =
                         {
                                 "label":                label,
@@ -340,7 +312,7 @@ exports.MaterialsPopup = Montage.create(Component, {
                                 "controlType":  "ColorChip",
                 "defaults":
                 {
-                                        "color":        { r:color[0]*255, g:color[1]*255, b:color[2]*255, a:color[3] }
+                                        "color":        colorObj
                                 }
                         };
 
@@ -654,7 +626,7 @@ exports.MaterialsPopup = Montage.create(Component, {
     _materialsData: {
                 enumerable: true,
         serializable: true,
-            value: this._dummyData1
+            value: []
     
         },
 
@@ -666,7 +638,10 @@ exports.MaterialsPopup = Montage.create(Component, {
             },
         set: function(data) {
             this._materialsData = data;
-            this.materialsProperties.needsDraw = true;
+            if(this.materialsProperties)
+            {
+                this.materialsProperties.needsDraw = true;
+            }
         }
     }