1 files changed, 362 insertions, 362 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 0d0435a4..501df282 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -79,25 +79,25 @@ exports.MaterialsPopup = Montage.create(Component, {
         serializable: true
     },
 
-        // Material Properties
+    // Material Properties
     _materialName: {
         enumerable: true,
         value: ""
     },
 
-        _useSelection: {  value: false,  enumerable: true },
-        _whichMaterial: { value: "fill", enumerable: true },
-        _originalValues: {value: null,  enumerable: true },
+    _useSelection: {  value: false,  enumerable: true },
+    _whichMaterial: { value: "fill", enumerable: true },
+    _originalValues: {value: null,  enumerable: true },
 
-        captureAction: {
-                value:function(event) {
-                        switch(event._currentTarget.label)
-                        {
-                                case "Cancel":
+    captureAction: {
+        value:function(event) {
+            switch(event._currentTarget.label)
+            {
+                case "Cancel":
 //                                      console.log("Cancel material edit");
-                                        this.revertToOriginalValues();
-                                        break;
-                                case "OK":
+                    this.revertToOriginalValues();
+                    break;
+                case "OK":
 //                                      console.log("Committing material with the following values:");
                     for(var i=0, len=this.materialsProperties.childComponents.length; i< len; i++)
                     {
@@ -116,19 +116,19 @@ exports.MaterialsPopup = Montage.create(Component, {
                         console.log("--------------");
 
                     }
-                                        break;
+                    break;
                 case "Save As...":
                     this.saveAs();
                     break;
                 case "Reset":
                     this.reset();
                     break;
-                        }
+            }
 
             // Notify Materials Library to close popup
             NJevent("hideMaterialPopup");
-                }
-        },
+        }
+    },
 
     saveAs:
     {
@@ -152,45 +152,45 @@ exports.MaterialsPopup = Montage.create(Component, {
         }
     },
 
-        revertToOriginalValues:
-        {
-                value: function()
-                {
-                        if (this._originalValues)
-                        {
-                                this._material.importJSON( this._originalValues );
-
-                                if (this._useSelection)
-                                {
-                                        var selection = this.application.ninja.selectedElements;
-                                        if (selection && (selection.length > 0))
-                                        {
-                                                var nObjs = selection.length;
-                                                for (var iObj=0;  iObj<nObjs;  iObj++)
-                                                {
-                                                        var canvas = selection[iObj];
-                                                        var obj;
-                                                        if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
-                                                        if (obj)
-                                                        {
-                                                                var matArray = obj._materialArray;
-                                                                var matTypeArray = obj._materialTypeArray;
-                                                                var nMats = matArray.length;
-                                                                for (var iMat=0;  iMat<nMats;  iMat++)
-                                                                {
-                                                                        if (matTypeArray[iMat] === this._whichMaterial)
-                                                                                matArray[iMat].importJSON( this._originalValues );
-                                                                }
-                                                                var world = obj.getWorld();
-                                                                if (world)
-                                                                        world.restartRenderLoop();
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                }
-        },
+    revertToOriginalValues:
+    {
+        value: function()
+        {
+            if (this._originalValues)
+            {
+                this._material.importJSON( this._originalValues );
+
+                if (this._useSelection)
+                {
+                    var selection = this.application.ninja.selectedElements;
+                    if (selection && (selection.length > 0))
+                    {
+                        var nObjs = selection.length;
+                        for (var iObj=0;  iObj<nObjs;  iObj++)
+                        {
+                            var canvas = selection[iObj];
+                            var obj;
+                            if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
+                            if (obj)
+                            {
+                                var matArray = obj._materialArray;
+                                var matTypeArray = obj._materialTypeArray;
+                                var nMats = matArray.length;
+                                for (var iMat=0;  iMat<nMats;  iMat++)
+                                {
+                                    if (matTypeArray[iMat] === this._whichMaterial)
+                                        matArray[iMat].importJSON( this._originalValues );
+                                }
+                                var world = obj.getWorld();
+                                if (world)
+                                    world.restartRenderLoop();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
 
     updatePreview:
     {
@@ -221,8 +221,8 @@ exports.MaterialsPopup = Montage.create(Component, {
 //                console.log(event.propertyLabel + " changing to " + event.propertyValue);
 //            }
 
-                        if (event.propertyLabel && event.propertyValue)
-                                this.applyProperty( event.propertyLabel,  event.propertyValue );
+            if (event.propertyLabel && event.propertyValue)
+                this.applyProperty( event.propertyLabel,  event.propertyValue );
         }
     },
 
@@ -230,7 +230,7 @@ exports.MaterialsPopup = Montage.create(Component, {
     {
         value: function(theEvent)
         {
-                        var event = theEvent._event;
+            var event = theEvent._event;
 //            if(typeof event.propertyValue === "object")
 //            {
 //                console.log(event.propertyLabel + " changed to ");
@@ -241,70 +241,70 @@ exports.MaterialsPopup = Montage.create(Component, {
 //                console.log(event.propertyLabel + " changed to " + event.propertyValue);
 //            }
 
-                        if (event.propertyLabel)
-                                this.applyProperty( event.propertyLabel,  event.propertyValue );
+            if (event.propertyLabel)
+                this.applyProperty( event.propertyLabel,  event.propertyValue );
         }
     },
 
-        applyProperty:
-        {
-                value: function( propLabel, propValue)
-                {
-                        // find the property lable in the array
-                        // This assumes no duplication in labels
-                        if (this._propLabels)
-                        {
-                                // the label cones through with a trailing ':'.  remove that
-                                var ch = propLabel[ propLabel.length - 1];
-                                if (ch == ':')
+    applyProperty:
+    {
+        value: function( propLabel, propValue)
+        {
+            // find the property lable in the array
+            // This assumes no duplication in labels
+            if (this._propLabels)
+            {
+                // the label cones through with a trailing ':'.  remove that
+                var ch = propLabel[ propLabel.length - 1];
+                if (ch == ':')