[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29370] trunk/blender/release/scripts: pep8, whitespace edits
Campbell Barton
ideasman42 at gmail.com
Wed Jun 9 21:12:03 CEST 2010
Revision: 29370
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29370
Author: campbellbarton
Date: 2010-06-09 21:12:03 +0200 (Wed, 09 Jun 2010)
Log Message:
-----------
pep8, whitespace edits
Modified Paths:
--------------
trunk/blender/release/scripts/modules/add_object_utils.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/op/console_python.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_physics_smoke.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_logic.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
Modified: trunk/blender/release/scripts/modules/add_object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/add_object_utils.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/modules/add_object_utils.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -21,6 +21,7 @@
import bpy
import mathutils
+
def add_object_align_init(context, operator):
if operator and operator.properties.is_property_set("location") and operator.properties.is_property_set("rotation"):
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -144,7 +144,7 @@
_loaded.append(mod)
if reload_scripts:
-
+
# TODO, this is broken but should work, needs looking into
'''
# reload modules that may not be directly included
@@ -369,7 +369,7 @@
time = time % 60.0
seconds = int(time)
- frames= int(round(math.floor(((time - seconds) * fps))))
+ frames = int(round(math.floor(((time - seconds) * fps))))
return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames)
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -433,7 +433,7 @@
closed loops have matching start and end values.
"""
line_polys = []
-
+
# Get edges not used by a face
if edges is None:
edges = self.edges
@@ -441,10 +441,10 @@
if not hasattr(edges, "pop"):
edges = edges[:]
- edge_dict= dict((ed.key, ed) for ed in self.edges if ed.selected)
-
+ edge_dict = dict((ed.key, ed) for ed in self.edges if ed.selected)
+
while edges:
- current_edge= edges.pop()
+ current_edge = edges.pop()
vert_end, vert_start = current_edge.verts[:]
line_poly = [vert_start, vert_end]
@@ -462,7 +462,7 @@
vert_end = line_poly[-1]
ok = 1
del edges[i]
- #break
+ # break
elif v2 == vert_end:
line_poly.append(v1)
vert_end = line_poly[-1]
@@ -474,7 +474,7 @@
vert_start = line_poly[0]
ok = 1
del edges[i]
- #break
+ # break
elif v2 == vert_start:
line_poly.insert(0, v1)
vert_start = line_poly[0]
@@ -486,7 +486,6 @@
return line_polys
-
class MeshEdge(StructRNA):
__slots__ = ()
Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/op/console_python.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -121,8 +121,8 @@
# unlikely, but this can happen with unicode errors for example.
import traceback
stderr.write(traceback.format_exc())
-
+
stdout.seek(0)
stderr.seek(0)
@@ -180,7 +180,7 @@
# note: unlikely stdin would be used for autocomp. but its possible.
stdin_backup = sys.stdin
sys.stdin = None
-
+
scrollback = ""
scrollback_error = ""
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/op/object.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -515,9 +515,9 @@
def execute(self, context):
act_type = context.object.type
-
+
for obj in context.visible_objects:
-
+
if obj.selected:
obj.restrict_render = False
else:
Modified: trunk/blender/release/scripts/op/sequencer.py
===================================================================
--- trunk/blender/release/scripts/op/sequencer.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/op/sequencer.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -138,6 +138,7 @@
register(SequencerCutMulticam)
register(SequencerDeinterlaceSelectedMovies)
+
def unregister():
unregister = bpy.types.unregister
@@ -145,7 +146,6 @@
unregister(SequencerCutMulticam)
unregister(SequencerDeinterlaceSelectedMovies)
-
if __name__ == "__main__":
register()
Modified: trunk/blender/release/scripts/op/uv.py
===================================================================
--- trunk/blender/release/scripts/op/uv.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/op/uv.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -178,7 +178,7 @@
fw('stroke\n')
fw('} def\n')
fw('newpath\n')
-
+
firstline = True
for i, uvs in self._face_uv_iter(context):
for j, uv in enumerate(uvs):
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/op/wm.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8-80 compliant>
+# <pep8 compliant>
import bpy
Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -739,7 +739,7 @@
else:
col = layout.column()
col.prop(con, "use_relative_position")
- if con.use_relative_position:
+ if con.use_relative_position:
col.prop(con, "offset", text="Relative Pivot Point")
else:
col.prop(con, "offset", text="Absolute Pivot Point")
@@ -747,6 +747,7 @@
col = layout.column()
col.prop(con, "enabled_rotation_range", text="Pivot When")
+
class OBJECT_PT_constraints(ConstraintButtonsPanel):
bl_label = "Object Constraints"
bl_context = "constraint"
Modified: trunk/blender/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_smoke.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/properties_physics_smoke.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -183,7 +183,7 @@
md = context.smoke.domain_settings
wide_ui = context.region.width > narrowui
-
+
layout.active = md.highres
split = layout.split()
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/properties_render.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -313,7 +313,7 @@
if rd.file_format in ('AVI_JPEG', 'JPEG'):
split = layout.split()
split.prop(rd, "file_quality", slider=True)
-
+
elif rd.file_format == 'MULTILAYER':
split = layout.split()
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/space_info.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -66,7 +66,7 @@
layout.template_running_jobs()
layout.template_reports_banner()
-
+
layout.label(text=scene.statistics())
# XXX: this should be right-aligned to the RHS of the region
@@ -198,6 +198,7 @@
layout.operator("mesh.primitive_grid_add", icon='MESH_GRID', text="Grid")
layout.operator("mesh.primitive_monkey_add", icon='MESH_MONKEY', text="Monkey")
+
class INFO_MT_curve_add(bpy.types.Menu):
bl_idname = "INFO_MT_curve_add"
bl_label = "Curve"
@@ -211,6 +212,7 @@
layout.operator("curve.primitive_nurbs_circle_add", icon='CURVE_NCIRCLE', text="Nurbs Circle")
layout.operator("curve.primitive_nurbs_path_add", icon='CURVE_PATH', text="Path")
+
class INFO_MT_armature_add(bpy.types.Menu):
bl_idname = "INFO_MT_armature_add"
bl_label = "Armature"
Modified: trunk/blender/release/scripts/ui/space_logic.py
===================================================================
--- trunk/blender/release/scripts/ui/space_logic.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/space_logic.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -46,6 +46,7 @@
row.prop(prop, "debug", text="", toggle=True, icon='INFO')
row.operator("object.game_property_remove", text="", icon='X').index = i
+
class LOGIC_MT_logicbricks_add(bpy.types.Menu):
bl_label = "Add"
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2010-06-09 16:15:45 UTC (rev 29369)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2010-06-09 19:12:03 UTC (rev 29370)
@@ -457,7 +457,7 @@
row = layout.row(align=True)
sub = row.row()
sub.scale_x = 2.0
-
+
if not context.screen.animation_playing:
sub.operator("screen.animation_play", text="", icon='PLAY')
else:
Modified: trunk/blender/release/scripts/ui/space_userpref.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list