Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / release / scripts / startup / bl_ui / space_view3d.py
index dd705f76feb82f5eccf2bb1e2a4a6195c0238511..6a9767f6743c6b90d09b50944b9f39fe63649fe3 100644 (file)
@@ -180,6 +180,10 @@ class VIEW3D_MT_transform(Menu):
         layout.operator("object.randomize_transform")
         layout.operator("object.align")
 
+        layout.separator()
+
+        layout.operator("object.anim_transforms_to_deltas")
+
 
 class VIEW3D_MT_mirror(Menu):
     bl_label = "Mirror"
@@ -1259,11 +1263,15 @@ class VIEW3D_MT_pose_transform(Menu):
 
         layout.operator("pose.transforms_clear", text="All")
 
+        layout.separator()
+
         layout.operator("pose.loc_clear", text="Location")
         layout.operator("pose.rot_clear", text="Rotation")
         layout.operator("pose.scale_clear", text="Scale")
 
-        layout.label(text="Origin")
+        layout.separator()
+
+        layout.operator("pose.user_transforms_clear", text="Reset unkeyed")
 
 
 class VIEW3D_MT_pose_slide(Menu):
@@ -2178,6 +2186,16 @@ class VIEW3D_PT_view3d_display(Panel):
 
         layout.separator()
 
+        layout.prop(view, "show_reconstruction")
+        if view.show_reconstruction:
+            layout.label(text="Bundle type:")
+            layout.prop(view, "bundle_draw_type", text="")
+            layout.prop(view, "bundle_draw_size")
+            layout.prop(view, "show_bundle_name")
+            layout.prop(view, "show_camera_path")
+
+        layout.separator()
+
         region = view.region_quadview
 
         layout.operator("screen.region_quadview", text="Toggle Quad View")
@@ -2283,8 +2301,10 @@ class VIEW3D_PT_background_image(Panel):
             box = layout.box()
             row = box.row(align=True)
             row.prop(bg, "show_expanded", text="", emboss=False)
-            if bg.image:
+            if bg.source == 'IMAGE' and bg.image:
                 row.prop(bg.image, "name", text="", emboss=False)
+            if bg.source == 'MOVIE' and bg.clip:
+                row.prop(bg.clip, "name", text="", emboss=False)
             else:
                 row.label(text="Not Set")
             row.operator("view3d.background_image_remove", text="", emboss=False, icon='X').index = i
@@ -2293,10 +2313,25 @@ class VIEW3D_PT_background_image(Panel):
 
             if bg.show_expanded:
                 row = box.row()
-                row.template_ID(bg, "image", open="image.open")
-                if (bg.image):
-                    box.template_image(bg, "image", bg.image_user, compact=True)
+                row.prop(bg, "source", expand=True)
+
+                hasbg = False
+                if bg.source == 'IMAGE':
+                    row = box.row()
+                    row.template_ID(bg, "image", open="image.open")
+                    if (bg.image):
+                        box.template_image(bg, "image", bg.image_user, compact=True)
+                        hasbg = True
+
+                elif bg.source == 'MOVIE':
+                    row = box.row()
+                    row.template_ID(bg, "clip", open="clip.open")
+
+                    if bg.clip:
+                        box.template_movieclip(bg, "clip", compact=True)
+                        hasbg = True
 
+                if hasbg:
                     box.prop(bg, "opacity", slider=True)
                     if bg.view_axis != 'CAMERA':
                         box.prop(bg, "size")