Merge branch 'master' into pentool

1 files changed, 12 insertions, 24 deletions

diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index b6c25baf..b82124d0 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -9,8 +9,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/panels/properties.reel/sections/three-d-view.reel",
-            "name": "ThreeD",
+            "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
             "properties": {
                 "element": {"#": "section"},
                 "x3DControl": {"@": "threeDPosX"},
@@ -28,8 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
         },
 
         "threeDPosX": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDPosX"},
                 "identifier": "x3D",
@@ -57,8 +55,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDPosY": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDPosY"},
                 "identifier": "y3D",
@@ -86,8 +83,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDPosZ": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDPosZ"},
                 "identifier": "z3D",
@@ -115,8 +111,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDRotX": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDRotX"},
                 "identifier": "xAngle",
@@ -146,8 +141,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDRotY": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDRotY"},
                 "identifier": "yAngle",
@@ -177,8 +171,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDRotZ": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDRotZ"},
                 "identifier": "zAngle",
@@ -208,15 +201,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             ]
         },
         "threeDPerspectiveDistance": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "threeDPerspectiveDistance"}
             }
         },
         "axisModeGroup": {
-            "module": "js/components/radio.reel",
-            "name": "RadioGroup",
+            "prototype": "js/components/radio.reel[RadioGroup]",
             "properties": {
                 "name": "rotationLG",
                 "selectedItem": {"@": "rdioLocal"},
@@ -224,8 +215,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "rdioLocal": {
-            "module": "js/components/radio.reel",
-            "name": "Radio",
+            "prototype": "js/components/radio.reel",
             "properties": {
                 "element": {"#": "rdioLocal"},
                 "label": "Local",
@@ -235,8 +225,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "rdioGlobal": {
-            "module": "js/components/radio.reel",
-            "name": "Radio",
+            "prototype": "js/components/radio.reel",
             "properties": {
                 "element": {"#": "rdioGlobal"},
                 "label": "Global",
@@ -245,8 +234,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "flattenCheckbox": {
-            "module": "montage/ui/checkbox.reel",
-            "name": "Checkbox",
+            "prototype": "montage/ui/checkbox.reel",
             "properties": {
                 "element": {"#": "flattenCh"},
                 "identifier": "flatten",