[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49963] trunk/blender/release/scripts: style cleanup
Campbell Barton
ideasman42 at gmail.com
Fri Aug 17 20:36:20 CEST 2012
Revision: 49963
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49963
Author: campbellbarton
Date: 2012-08-17 18:36:20 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/path.py
trunk/blender/release/scripts/startup/bl_operators/node.py
trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
Modified: trunk/blender/release/scripts/modules/bpy/path.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/path.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/modules/bpy/path.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -256,7 +256,7 @@
elif filename.endswith(".py") and filename != "__init__.py":
fullpath = join(path, filename)
modules.append((filename[0:-3], fullpath))
- elif ("." not in filename):
+ elif "." not in filename:
directory = join(path, filename)
fullpath = join(directory, "__init__.py")
if isfile(fullpath):
Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -100,10 +100,10 @@
# Enum item identifier has an additional prefix to distinguish base node types from node groups
item = self.type
- if (item.startswith(node_type_prefix)):
+ if item.startswith(node_type_prefix):
# item means base node type
node = tree.nodes.new(type=item[len(node_type_prefix):])
- elif (item.startswith(node_group_prefix)):
+ elif item.startswith(node_group_prefix):
# item means node group type
node = tree.nodes.new(type='GROUP', group=bpy.data.node_groups[item[len(node_group_prefix):]])
else:
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -44,10 +44,10 @@
col = split.column()
col.label(text="Display Range:")
sub = col.column(align=True)
- if (mps.type == 'CURRENT_FRAME'):
+ if mps.type == 'CURRENT_FRAME':
sub.prop(mps, "frame_before", text="Before")
sub.prop(mps, "frame_after", text="After")
- elif (mps.type == 'RANGE'):
+ elif mps.type == 'RANGE':
sub.prop(mps, "frame_start", text="Start")
sub.prop(mps, "frame_end", text="End")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -106,7 +106,7 @@
sub.prop(curve, "resolution_v", text="Preview V")
sub.prop(curve, "render_resolution_v", text="Render V")
- if (is_curve or is_text):
+ if is_curve or is_text:
col.label(text="Fill:")
sub = col.column()
sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D'))
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -322,9 +322,9 @@
col.row().prop(lamp, "shape", expand=True)
sub = col.row(align=True)
- if (lamp.shape == 'SQUARE'):
+ if lamp.shape == 'SQUARE':
sub.prop(lamp, "size")
- elif (lamp.shape == 'RECTANGLE'):
+ elif lamp.shape == 'RECTANGLE':
sub.prop(lamp, "size", text="Size X")
sub.prop(lamp, "size_y", text="Size Y")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -1008,7 +1008,7 @@
sub.active = (part.draw_color in {'VELOCITY', 'ACCELERATION'})
sub.prop(part, "color_maximum", text="Max")
- if (path):
+ if path:
col.prop(part, "draw_step")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -92,7 +92,7 @@
layout.separator()
layout.prop(field, "guide_kink_type")
- if (field.guide_kink_type != 'NONE'):
+ if field.guide_kink_type != 'NONE':
layout.prop(field, "guide_kink_axis")
split = layout.split()
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -497,7 +497,7 @@
col = layout.column(align=True)
col.prop(strip, "use_uniform_scale")
- if (strip.use_uniform_scale):
+ if strip.use_uniform_scale:
col = layout.column(align=True)
col.prop(strip, "scale_start_x", text="Scale")
else:
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-08-17 18:35:33 UTC (rev 49962)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-08-17 18:36:20 UTC (rev 49963)
@@ -2557,7 +2557,7 @@
if bg.source == 'IMAGE':
row = box.row()
row.template_ID(bg, "image", open="image.open")
- if (bg.image):
+ if bg.image is not None:
box.template_image(bg, "image", bg.image_user, compact=True)
has_bg = True
More information about the Bf-blender-cvs
mailing list