From 86a801c057fc3b0580d6130be5740c2ee503444f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 27 Jan 2012 15:52:36 -0800
Subject: updated from old repo

---
 js/panels/Materials/Materials.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'js/panels')

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" />
-- 
cgit v1.2.3


From e78f4312c194d9e8188075cf1fe87e4be22b24e4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 9 Feb 2012 11:56:40 -0800
Subject: adding oneway to the 3d bindings to fix a bug where the stage was
 getting selected.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/properties/sections/three-d-view.reel/three-d-view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/panels')

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
                 });
         }
     },
-- 
cgit v1.2.3