Merge branch 'refs/heads/master' into components

3 files changed, 18 insertions, 7 deletions

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index de07990e..cdeee69e 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -2,7 +2,17 @@
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
           <leaf id="UberMaterial" label="Uber" />
+      <leaf id="RadialBlurMaterial" label="Radial Blur" />
+      <leaf id="PulseMaterial" label="Pulse" />
+      <leaf id="TunnelMaterial" label="Tunnel" />
+      <leaf id="TwistMaterial" label="Twist" />
+      <leaf id="KeleidoscopeMaterial" label="Keleidoscope" />
+      <leaf id="JuliaMaterial" label="Julia" />
+      <leaf id="MandelMaterial" label="Mandel" />
+     <leaf id="PlasmaMaterial" label="Plasma" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
+      <leaf id="LinearGradientMaterial" label="Linear Gradient" />
+      <leaf id="RadialGradientMaterial" label="Radial Gradient" />
     </folder>
     <folder id="customMaterials" label="Custom Materials">
         <leaf id="CheckerBoard" label="CheckerBoard" />
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
index 11a5b3f2..1e24cb55 100644
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
@@ -39,7 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "x3D",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
@@ -68,7 +68,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "y3D",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
@@ -97,7 +97,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "z3D",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
@@ -128,7 +128,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "xAngle",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
@@ -159,7 +159,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "yAngle",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
@@ -190,7 +190,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "zAngle",
-                    "oneway": true
+                    "oneway": false
                 }
             },
             "listeners": [
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
index 96053490..0c4a9171 100644
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
@@ -215,7 +215,8 @@ exports.ThreeD = Montage.create(Component, {
             Object.defineBinding(this, "item", {
                     boundObject: this,
                     boundObjectPropertyPath: "application.ninja.selectedElements",
-                    boundValueMutator: this._getSelectedItem
+                    boundValueMutator: this._getSelectedItem,
+                    oneway: true
                 });
         }
     },