Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

1 files changed, 33 insertions, 0 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 53fec3be..52360302 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -486,6 +497,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -580,6 +602,17 @@ exports.PiData = Montage.create( Montage, {
                     ],
                     [
                         {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",