[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49356] trunk/blender: code cleanup: assign mode to a variable in the 3d view header and remove some unused imports
Campbell Barton
ideasman42 at gmail.com
Sun Jul 29 16:07:57 CEST 2012
Revision: 49356
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49356
Author: campbellbarton
Date: 2012-07-29 14:07:57 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
code cleanup: assign mode to a variable in the 3d view header and remove some unused imports
Modified Paths:
--------------
trunk/blender/doc/python_api/examples/bpy.ops.2.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/tools/check_style_c.py
trunk/blender/source/tools/spell_check_source.py
Modified: trunk/blender/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.ops.2.py 2012-07-29 13:52:38 UTC (rev 49355)
+++ trunk/blender/doc/python_api/examples/bpy.ops.2.py 2012-07-29 14:07:57 UTC (rev 49356)
@@ -19,4 +19,4 @@
# group add popup
import bpy
-bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
\ No newline at end of file
+bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-07-29 13:52:38 UTC (rev 49355)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-07-29 14:07:57 UTC (rev 49356)
@@ -64,28 +64,29 @@
layout.template_header_3D()
if obj:
+ mode = obj.mode
# Particle edit
- if obj.mode == 'PARTICLE_EDIT':
+ if mode == 'PARTICLE_EDIT':
row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
# 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="")
# Proportional editing
- if obj.mode in {'EDIT', 'PARTICLE_EDIT'}:
+ if mode in {'EDIT', 'PARTICLE_EDIT'}:
row = layout.row(align=True)
row.prop(toolsettings, "proportional_edit", text="", icon_only=True)
if toolsettings.proportional_edit != 'DISABLED':
row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
- elif obj.mode == 'OBJECT':
+ elif mode == 'OBJECT':
row = layout.row(align=True)
row.prop(toolsettings, "use_proportional_edit_objects", text="", icon_only=True)
if toolsettings.use_proportional_edit_objects:
row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
# 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
row = layout.row(align=True)
row.prop(toolsettings, "use_snap", text="")
@@ -93,9 +94,9 @@
if snap_element != 'INCREMENT':
row.prop(toolsettings, "snap_target", text="")
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="")
- elif obj.mode == 'EDIT':
+ elif mode == 'EDIT':
row.prop(toolsettings, "use_snap_self", text="")
if snap_element == 'VOLUME':
@@ -110,7 +111,7 @@
props.animation = True
# Pose
- if obj and obj.mode == 'POSE':
+ if obj and mode == 'POSE':
row = layout.row(align=True)
row.operator("pose.copy", text="", icon='COPYDOWN')
row.operator("pose.paste", text="", icon='PASTEDOWN')
Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py 2012-07-29 13:52:38 UTC (rev 49355)
+++ trunk/blender/source/tools/check_style_c.py 2012-07-29 14:07:57 UTC (rev 49356)
@@ -39,7 +39,7 @@
# - line length - in a not-too-annoying way
# (allow for long arrays in struct definitions, PyMethodDef for eg)
-from pygments import highlight, lex
+from pygments import lex # highlight
from pygments.lexers import CLexer
from pygments.formatters import RawTokenFormatter
Modified: trunk/blender/source/tools/spell_check_source.py
===================================================================
--- trunk/blender/source/tools/spell_check_source.py 2012-07-29 13:52:38 UTC (rev 49355)
+++ trunk/blender/source/tools/spell_check_source.py 2012-07-29 14:07:57 UTC (rev 49356)
@@ -125,7 +125,6 @@
def extract_py_comments(filepath):
- import sys
import token
import tokenize
More information about the Bf-blender-cvs
mailing list