aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/object3d-properties.reel/object3d-properties.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.html')
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 3f882850..1c9505a0 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
14 { 14 {
15 15
16 "owner": { 16 "owner": {
17 "module": "js/components/tools-properties/object3d-properties.reel", 17 "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
18 "name": "Object3DProperties",
19 "properties": { 18 "properties": {
20 "element": {"#": "object3DProperties"}, 19 "element": {"#": "object3DProperties"},
21 20
@@ -30,10 +29,10 @@
30 </head> 29 </head>
31 30
32 <body> 31 <body>
33 <div id="object3DProperties" class="subToolHolderPanel"> 32 <div data-montage-id="object3DProperties" class="subToolHolderPanel">
34 <div id="rotateObjectToolContainer" class="tagRadioButtons"> 33 <div id="rotateObjectToolContainer" class="tagRadioButtons">
35 <input type="radio" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/> 34 <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/>
36 <input type="radio" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/> 35 <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/>
37 </div> 36 </div>
38 </div> 37 </div>
39 </body> 38 </body>