Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

1 files changed, 77 insertions, 25 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 81bd1867..5206ae16 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -38,13 +38,11 @@ var Layer = exports.Layer = Montage.create(Component, {
     _arrLayerStyles : {
         serializable: true,
                 enumerable: true,
-        serializable: true,
             value: []
     },
     arrLayerStyles : {
         serializable: true,
         enumerable: true,
-        serializable: true,
         get: function() {
                 return this._arrLayerStyles;
         },
@@ -84,8 +82,8 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._layerName) {
                         this._layerEditable.value = newVal;
                         this._layerName = newVal;
-                        this._layerEditable.needsDraw = true;
-                        this.needsDraw = true;
+                        this.layerData.layerName = newVal;
+                        this.log('layerName setter: ' + newVal)
                 }
                 
         }
@@ -110,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionX:{
@@ -121,7 +119,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionX !== value) {
                         this._dtextPositionX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -129,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextPositionY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionY:{
@@ -140,7 +138,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionY !== value) {
                         this._dtextPositionY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -148,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleX:{
@@ -159,7 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleX !== value) {
                         this._dtextScaleX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -167,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleY:{
@@ -178,7 +176,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleY !== value) {
                         this._dtextScaleY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -186,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewX:{
@@ -197,7 +195,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewX !== value) {
                         this._dtextSkewX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -205,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewY:{
@@ -216,7 +214,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewY !== value) {
                         this._dtextSkewY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -224,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextRotate : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextRotate:{
@@ -235,7 +233,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextRotate !== value) {
                         this._dtextRotate = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -257,10 +255,11 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (value !== this._isSelected) {
                         // Only concerned about different values
                         if (value === false) {
-                                // If changing from false to true, we need to deselect any associated styles
+                                // If changing from true to false, we need to deselect any associated styles
                                 this.selectStyle(false);
                         }
                         this._isSelected = value;
+                        this.layerData.isSelected = value;
                         this.needsDraw = true;
                 }
             
@@ -334,7 +333,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set: function(newVal) {
                 if (newVal !== this._isTransformCollapsed) {
                         this._isTransformCollapsed = newVal;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
         }