Merging r38615 through r38636 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jul 2011 18:42:58 +0000 (18:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jul 2011 18:42:58 +0000 (18:42 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py

index c5f1e0ff7afcaedd8f8df77b696235c466fb2104,b5e813d16e7a70bd8d7b92bb41ef6663748c4080..93cef8804e14106e719ff3771bcea107dc5e8910
@@@ -68,7 -68,7 +68,7 @@@ class VIEW3D_HT_header(bpy.types.Header
          if obj:
              # Particle edit
              if obj.mode == 'PARTICLE_EDIT':
-                 row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True, toggle=True)
+                 row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
  
              # Occlude geometry
              if view.viewport_shade in {'SOLID', 'SHADED', 'TEXTURED'} and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')):
@@@ -2180,16 -2180,6 +2180,16 @@@ class VIEW3D_PT_view3d_display(bpy.type
  
          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")
@@@ -2295,10 -2285,8 +2295,10 @@@ class VIEW3D_PT_background_image(bpy.ty
              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
  
              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", bg.clip_user, compact=True)
 +                        hasbg = True
  
 +                if hasbg:
                      box.prop(bg, "opacity", slider=True)
                      if bg.view_axis != 'CAMERA':
                          box.prop(bg, "size")