aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/object3d-properties.reel/object3d-properties.html
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.html')
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
1 files changed, 3 insertions, 3 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 1c9505a0..70ed79f9 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -30,9 +30,9 @@
30 30
31 <body> 31 <body>
32 <div data-montage-id="object3DProperties" class="subToolHolderPanel"> 32 <div data-montage-id="object3DProperties" class="subToolHolderPanel">
33 <div id="rotateObjectToolContainer" class="tagRadioButtons"> 33 <div class="tagRadioButtons object3DToolContainer">
34 <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/> 34 <input type="radio" data-montage-id="rotateLocally" class="toolOptsRadioButton rotateLocally" title="Rotate Locally" name="rotateObject" checked/>
35 <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/> 35 <input type="radio" data-montage-id="rotateGlobally" class="toolOptsRadioButton rotateGlobally" title="Rotate Globally" name="rotateObject"/>
36 </div> 36 </div>
37 </div> 37 </div>
38 </body> 38 </body>