aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/properties.reel/sections/three-d-view.reel
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-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/panels/properties.reel/sections/three-d-view.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html30
1 files changed, 15 insertions, 15 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 b82124d0..5ef13fab 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
@@ -259,43 +259,43 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
259 </script> 259 </script>
260</head> 260</head>
261<body> 261<body>
262<section id="section" class="sectional"> 262<section data-montage-id="section" class="sectional">
263 <section id="axisMode" class="fieldCol rotation"> 263 <section data-montage-id="axisMode" class="fieldCol rotation">
264 <label>Axis:</label> 264 <label>Axis:</label>
265 <article class="fieldRow"> 265 <article class="fieldRow">
266 <div class="inputField"> 266 <div class="inputField">
267 <div id="rdioLocal"></div> 267 <div data-montage-id="rdioLocal"></div>
268 </div> 268 </div>
269 </article> 269 </article>
270 <article class="fieldRow"> 270 <article class="fieldRow">
271 <div class="inputField"> 271 <div class="inputField">
272 <div id="rdioGlobal"></div> 272 <div data-montage-id="rdioGlobal"></div>
273 </div> 273 </div>
274 </article> 274 </article>
275 </section> 275 </section>
276 <hr /> 276 <hr />
277 <section class="fieldCol"> 277 <section class="fieldCol">
278 <label id="lblthreeDX">X:</label> 278 <label data-montage-id="lblthreeDX">X:</label>
279 <article class="fieldRow threeCol"> 279 <article class="fieldRow threeCol">
280 <div> 280 <div>
281 <div class="inputField"> 281 <div class="inputField">
282 <div id="threeDPosX"></div> 282 <div data-montage-id="threeDPosX"></div>
283 </div> 283 </div>
284 </div> 284 </div>
285 <div> 285 <div>
286 <div> 286 <div>
287 <label id="lblthreeDY">Y: </label> 287 <label data-montage-id="lblthreeDY">Y: </label>
288 </div> 288 </div>
289 <div class="inputField"> 289 <div class="inputField">
290 <div id="threeDPosY"></div> 290 <div data-montage-id="threeDPosY"></div>
291 </div> 291 </div>
292 </div> 292 </div>
293 <div> 293 <div>
294 <div> 294 <div>
295 <label id="lblthreeDZ">Z: </label> 295 <label data-montage-id="lblthreeDZ">Z: </label>
296 </div> 296 </div>
297 <div class="inputField"> 297 <div class="inputField">
298 <div id="threeDPosZ"></div> 298 <div data-montage-id="threeDPosZ"></div>
299 </div> 299 </div>
300 </div> 300 </div>
301 </article> 301 </article>
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
306 <article class="fieldRow threeCol"> 306 <article class="fieldRow threeCol">
307 <div> 307 <div>
308 <div class="inputField"> 308 <div class="inputField">
309 <div id="threeDRotX"></div> 309 <div data-montage-id="threeDRotX"></div>
310 </div> 310 </div>
311 </div> 311 </div>
312 <div> 312 <div>
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
314 <label>Y: </label> 314 <label>Y: </label>
315 </div> 315 </div>
316 <div class="inputField"> 316 <div class="inputField">
317 <div id="threeDRotY"></div> 317 <div data-montage-id="threeDRotY"></div>
318 </div> 318 </div>
319 </div> 319 </div>
320 <div> 320 <div>
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
322 <label>Z: </label> 322 <label>Z: </label>
323 </div> 323 </div>
324 <div class="inputField"> 324 <div class="inputField">
325 <div id="threeDRotZ"></div> 325 <div data-montage-id="threeDRotZ"></div>
326 </div> 326 </div>
327 </div> 327 </div>
328 </article> 328 </article>
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
336 <label style="padding-right:14px;">Perspective Distance: </label> 336 <label style="padding-right:14px;">Perspective Distance: </label>
337 </div> 337 </div>
338 <div class="inputField" > 338 <div class="inputField" >
339 <div id="threeDPerspectiveDistance"></div> 339 <div data-montage-id="threeDPerspectiveDistance"></div>
340 </div> 340 </div>
341 </div> 341 </div>
342 </article> 342 </article>
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
347 <article class="fieldRow oneCol checkbox"> 347 <article class="fieldRow oneCol checkbox">
348 <div> 348 <div>
349 <div class="inputField"> 349 <div class="inputField">
350 <input id="flattenCh" class="nj-skinned" type="checkbox" /> 350 <input data-montage-id="flattenCh" class="nj-skinned" type="checkbox" />
351 </div> 351 </div>
352 <div> 352 <div>
353 <label> Flatten</label> 353 <label> Flatten</label>