diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.html')
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.html | 6 |
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 58c29db5..1c9505a0 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
| @@ -29,10 +29,10 @@ | |||
| 29 | </head> | 29 | </head> |
| 30 | 30 | ||
| 31 | <body> | 31 | <body> |
| 32 | <div id="object3DProperties" class="subToolHolderPanel"> | 32 | <div data-montage-id="object3DProperties" class="subToolHolderPanel"> |
| 33 | <div id="rotateObjectToolContainer" class="tagRadioButtons"> | 33 | <div id="rotateObjectToolContainer" class="tagRadioButtons"> |
| 34 | <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/> |
| 35 | <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"/> |
| 36 | </div> | 36 | </div> |
| 37 | </div> | 37 | </div> |
| 38 | </body> | 38 | </body> |