Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: assign mode to a variable in the 3d view header and remove some unused imports

Browse Source
This commit is contained in:
Campbell Barton
2012-07-29 14:07:57 +00:00
parent 588e4a4327
commit 4ef8f3f537
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/examples/bpy.ops.2.py
View File

@@ -19,4 +19,4 @@ The execution context is as a non keyword, string argument in:
# group add popup # group add popup
import bpy import bpy
bpy.ops.object.group_instance_add('INVOKE_DEFAULT') bpy.ops.object.group_instance_add('INVOKE_DEFAULT')

17
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -64,28 +64,29 @@ class VIEW3D_HT_header(Header):
layout.template_header_3D() layout.template_header_3D()
if obj: if obj:
mode = obj.mode
# Particle edit # Particle edit
if obj.mode == 'PARTICLE_EDIT': if mode == 'PARTICLE_EDIT':
row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True) row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
# Occlude geometry # Occlude geometry
if view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): if view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (mode == 'PARTICLE_EDIT' or (mode == 'EDIT' and obj.type == 'MESH')):
row.prop(view, "use_occlude_geometry", text="") row.prop(view, "use_occlude_geometry", text="")
# Proportional editing # Proportional editing
if obj.mode in {'EDIT', 'PARTICLE_EDIT'}: if mode in {'EDIT', 'PARTICLE_EDIT'}:
row = layout.row(align=True) row = layout.row(align=True)
row.prop(toolsettings, "proportional_edit", text="", icon_only=True) row.prop(toolsettings, "proportional_edit", text="", icon_only=True)
if toolsettings.proportional_edit != 'DISABLED': if toolsettings.proportional_edit != 'DISABLED':
row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True) row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
elif obj.mode == 'OBJECT': elif mode == 'OBJECT':
row = layout.row(align=True) row = layout.row(align=True)
row.prop(toolsettings, "use_proportional_edit_objects", text="", icon_only=True) row.prop(toolsettings, "use_proportional_edit_objects", text="", icon_only=True)
if toolsettings.use_proportional_edit_objects: if toolsettings.use_proportional_edit_objects:
row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True) row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
# Snap # Snap
if not obj or obj.mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT'}: if not obj or mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT'}:
snap_element = toolsettings.snap_element snap_element = toolsettings.snap_element
row = layout.row(align=True) row = layout.row(align=True)
row.prop(toolsettings, "use_snap", text="") row.prop(toolsettings, "use_snap", text="")
@@ -93,9 +94,9 @@ class VIEW3D_HT_header(Header):
if snap_element != 'INCREMENT': if snap_element != 'INCREMENT':
row.prop(toolsettings, "snap_target", text="") row.prop(toolsettings, "snap_target", text="")
if obj: if obj:
if obj.mode in {'OBJECT', 'POSE'} and snap_element != 'VOLUME': if mode in {'OBJECT', 'POSE'} and snap_element != 'VOLUME':
row.prop(toolsettings, "use_snap_align_rotation", text="") row.prop(toolsettings, "use_snap_align_rotation", text="")
elif obj.mode == 'EDIT': elif mode == 'EDIT':
row.prop(toolsettings, "use_snap_self", text="") row.prop(toolsettings, "use_snap_self", text="")
if snap_element == 'VOLUME': if snap_element == 'VOLUME':
@@ -110,7 +111,7 @@ class VIEW3D_HT_header(Header):
props.animation = True props.animation = True
# Pose # Pose
if obj and obj.mode == 'POSE': if obj and mode == 'POSE':
row = layout.row(align=True) row = layout.row(align=True)
row.operator("pose.copy", text="", icon='COPYDOWN') row.operator("pose.copy", text="", icon='COPYDOWN')
row.operator("pose.paste", text="", icon='PASTEDOWN') row.operator("pose.paste", text="", icon='PASTEDOWN')