diff options
author | Alexander Pinzon <apinzonf@gmail.com> | 2013-07-22 20:41:36 +0400 |
---|---|---|
committer | Alexander Pinzon <apinzonf@gmail.com> | 2013-07-22 20:41:36 +0400 |
commit | c80af0190da694437597ec6e5e9777663dd23060 (patch) | |
tree | 0208166a80bc0786d785c2a13195447b7bddbffa /release/scripts/startup/bl_ui/space_view3d.py | |
parent | c32f0ed4a291c8befda9776f8fa19a4dc061cfdb (diff) | |
parent | 9634f8f1151740609230c24761ac20fdfe1a9168 (diff) |
svn merge ^/trunk/blender 58270:58498
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1fdc550493e..fd4e821e731 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -293,7 +293,10 @@ class VIEW3D_MT_snap(Menu): layout = self.layout layout.operator("view3d.snap_selected_to_grid", text="Selection to Grid") - layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor") + props = layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor") + props.use_offset = False + props = layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor (Offset)") + props.use_offset = True layout.separator() @@ -723,6 +726,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): layout.separator() + layout.operator("lattice.select_random") layout.operator("lattice.select_all").action = 'TOGGLE' layout.operator("lattice.select_all", text="Inverse").action = 'INVERT' @@ -747,6 +751,11 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.separator() + layout.operator("armature.select_more", text="More") + layout.operator("armature.select_less", text="Less") + + layout.separator() + layout.operator("armature.select_hierarchy", text="Parent").direction = 'PARENT' layout.operator("armature.select_hierarchy", text="Child").direction = 'CHILD' @@ -2535,7 +2544,7 @@ class VIEW3D_PT_view3d_display(Panel): view = context.space_data scene = context.scene gs = scene.game_settings - ob = context.object + obj = context.object col = layout.column() col.prop(view, "show_only_render") @@ -2575,6 +2584,8 @@ class VIEW3D_PT_view3d_display(Panel): if view.use_matcap: col.template_icon_view(view, "matcap_icon") col.prop(view, "show_backface_culling") + if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}: + col.prop(view, "show_occlude_wire") layout.separator() |