[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27289] trunk/blender/release/scripts: pep8 cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Mar 6 02:40:31 CET 2010
Revision: 27289
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27289
Author: campbellbarton
Date: 2010-03-06 02:40:29 +0100 (Sat, 06 Mar 2010)
Log Message:
-----------
pep8 cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/io/engine_render_pov.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/io/import_scene_obj.py
trunk/blender/release/scripts/io/import_shape_mdd.py
trunk/blender/release/scripts/modules/rigify/__init__.py
trunk/blender/release/scripts/modules/rigify/copy.py
trunk/blender/release/scripts/modules/rigify/finger_curl.py
trunk/blender/release/scripts/modules/rigify/leg_biped.py
trunk/blender/release/scripts/modules/rigify/neck_flex.py
trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
trunk/blender/release/scripts/modules/rigify/stretch.py
trunk/blender/release/scripts/modules/rigify/tail_control.py
trunk/blender/release/scripts/modules/rigify/track_dual.py
trunk/blender/release/scripts/modules/rigify/track_reverse.py
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/release/scripts/op/add_armature_human.py
trunk/blender/release/scripts/op/image.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/op/uvcalc_follow_active.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator_modal_draw.py
trunk/blender/release/scripts/ui/properties_animviz.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/scripts/io/engine_render_pov.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/io/engine_render_pov.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -954,6 +954,7 @@
for cls in classes:
register(cls)
+
def unregister():
unregister = bpy.types.unregister
for cls in classes:
@@ -961,4 +962,3 @@
if __name__ == "__main__":
register()
-
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/io/export_mdd.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -191,10 +191,10 @@
bpy.types.register(ExportMDD)
bpy.types.INFO_MT_file_export.append(menu_func)
+
def unregister():
bpy.types.unregister(ExportMDD)
bpy.types.INFO_MT_file_export.remove(menu_func)
if __name__ == "__main__":
register()
-
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/io/import_scene_obj.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -1648,4 +1648,3 @@
if __name__ == "__main__":
register()
-
Modified: trunk/blender/release/scripts/io/import_shape_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/import_shape_mdd.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/io/import_shape_mdd.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -25,7 +25,7 @@
# origonal model the mdd was Baked out from their will be Strange
# behavior
#
-# vertex animation to ShapeKeys with ipo and gives the frame a value of 1.0
+# vertex animation to ShapeKeys with ipo and gives the frame a value of 1.0
# A modifier to read mdd files would be Ideal but thats for another day :)
#
# Please send any fixes,updates,bugs to Slow67_at_Gmail.com
@@ -36,15 +36,15 @@
def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1):
-
+
print('\n\nimporting mdd "%s"' % filepath)
-
+
bpy.ops.object.mode_set(mode='OBJECT')
file = open(filepath, 'rb')
frames, points = unpack(">2i", file.read(8))
time = unpack((">%df" % frames), file.read(frames * 4))
-
+
print('\tpoints:%d frames:%d' % (points,frames))
# If target object doesn't have Basis shape key, create it.
@@ -58,27 +58,27 @@
scene.current_frame = PREF_START_FRAME
def UpdateMesh(ob, fr):
-
+
# Insert new shape key
new_shapekey = ob.add_shape_key()
new_shapekey.name = ("frame_%.4d" % fr)
new_shapekey_name = new_shapekey.name
-
+
ob.active_shape_key_index = len(ob.data.shape_keys.keys)-1
index = len(ob.data.shape_keys.keys)-1
ob.shape_key_lock = True
-
+
verts = ob.data.shape_keys.keys[ len(ob.data.shape_keys.keys)-1 ].data
-
+
for v in verts:
# 12 is the size of 3 floats
x,y,z= unpack('>3f', file.read(12))
v.co[:] = x,z,y
#me.update()
ob.shape_key_lock = False
-
+
# insert keyframes
shape_keys = ob.data.shape_keys
@@ -94,13 +94,13 @@
ob.data.shape_keys.keys[index].value = 0.0
shape_keys.keys[len(ob.data.shape_keys.keys)-1].keyframe_insert("value")
- ob.data.update()
+ ob.data.update()
for i in range(frames):
UpdateMesh(ob, i)
-
+
from bpy.props import *
@@ -148,7 +148,7 @@
def register():
bpy.types.register(importMDD)
bpy.types.INFO_MT_file_import.append(menu_func)
-
+
def unregister():
bpy.types.unregister(importMDD)
bpy.types.INFO_MT_file_import.remove(menu_func)
Modified: trunk/blender/release/scripts/modules/rigify/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/__init__.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/__init__.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -26,10 +26,10 @@
SPECIAL_TYPES = "root",
LAYER_TYPES = "main", "extra", "ik", "fk"
-ORG_LAYERS = [n==31 for n in range(0,32)]
-MCH_LAYERS = [n==30 for n in range(0,32)]
-DEF_LAYERS = [n==29 for n in range(0,32)]
-ROOT_LAYERS = [n==28 for n in range(0,32)]
+ORG_LAYERS = [n == 31 for n in range(0, 32)]
+MCH_LAYERS = [n == 30 for n in range(0, 32)]
+DEF_LAYERS = [n == 29 for n in range(0, 32)]
+ROOT_LAYERS = [n == 28 for n in range(0, 32)]
ORG_PREFIX = "ORG-"
MCH_PREFIX = "MCH-"
@@ -38,7 +38,6 @@
WGT_PREFIX = "WGT-"
-
class RigifyError(Exception):
"""Exception raised for errors in the metarig.
"""
@@ -456,12 +455,12 @@
bone.deform = True
else:
# Assign bone appearance if there is a widget for it
- obj.pose.bones[bone_name].custom_shape = context.scene.objects.get(WGT_PREFIX+bone_name)
+ obj.pose.bones[bone_name].custom_shape = context.scene.objects.get(WGT_PREFIX + bone_name)
layer_tot[:] = [max(lay) for lay in zip(layer_tot, bone.layer)]
# Only for demo'ing
- layer_show = [a and not (b or c or d) for a,b,c,d in zip(layer_tot, ORG_LAYERS, MCH_LAYERS, DEF_LAYERS)]
+ layer_show = [a and not (b or c or d) for a, b, c, d in zip(layer_tot, ORG_LAYERS, MCH_LAYERS, DEF_LAYERS)]
arm.layer = layer_show
Modified: trunk/blender/release/scripts/modules/rigify/copy.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/copy.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/copy.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -110,4 +110,3 @@
deform(obj, bone_definition, base_names, options)
return (cpy,)
-
Modified: trunk/blender/release/scripts/modules/rigify/finger_curl.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/finger_curl.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/finger_curl.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -215,8 +215,8 @@
# Set up bones for hinge
if make_hinge:
- socket = copy_bone_simple(arm, org_f1, "MCH-socket_"+control, parent=True).name
- hinge = copy_bone_simple(arm, eb[org_f1].parent.name, "MCH-hinge_"+control).name
+ socket = copy_bone_simple(arm, org_f1, "MCH-socket_" + control, parent=True).name
+ hinge = copy_bone_simple(arm, eb[org_f1].parent.name, "MCH-hinge_" + control).name
eb[control].connected = False
eb[control].parent = eb[hinge]
@@ -343,7 +343,7 @@
# Last step setup layers
if "ex_layer" in options:
- layer = [n==options["ex_layer"] for n in range(0,32)]
+ layer = [n == options["ex_layer"] for n in range(0, 32)]
else:
layer = list(arm.bones[bone_definition[0]].layer)
for bone_name in [f1, f2, f3]:
Modified: trunk/blender/release/scripts/modules/rigify/leg_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_biped.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/leg_biped.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -227,7 +227,7 @@
con = ik_chain.shin_p.constraints.new('IK')
con.chain_length = 2
con.iterations = 500
- con.pole_angle = -pi/2
+ con.pole_angle = -pi / 2.0
con.use_tail = True
con.use_stretch = True
con.use_target = True
@@ -265,7 +265,7 @@
# last step setup layers
if "ik_layer" in options:
- layer = [n==options["ik_layer"] for n in range(0,32)]
+ layer = [n == options["ik_layer"] for n in range(0, 32)]
else:
layer = list(mt_chain.thigh_b.layer)
for attr in ik_chain.attr_names:
@@ -368,7 +368,7 @@
# last step setup layers
if "fk_layer" in options:
- layer = [n==options["fk_layer"] for n in range(0,32)]
+ layer = [n == options["fk_layer"] for n in range(0, 32)]
else:
layer = list(mt_chain.thigh_b.layer)
for attr in fk_chain.attr_names:
@@ -499,4 +499,3 @@
bpy.ops.object.mode_set(mode='OBJECT')
blend_bone_list(obj, bone_definition + [None], bones_fk, bones_ik, target_bone=bones_ik[6], target_prop="ik", blend_default=1.0)
-
Modified: trunk/blender/release/scripts/modules/rigify/neck_flex.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/neck_flex.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/neck_flex.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -332,7 +332,7 @@
# last step setup layers
if "ex_layer" in options:
- layer = [n==options["ex_layer"] for n in range(0,32)]
+ layer = [n == options["ex_layer"] for n in range(0, 32)]
else:
layer = list(arm.bones[bone_definition[1]].layer)
for attr in ex_chain.attr_names:
@@ -346,4 +346,3 @@
# no blending the result of this
return None
-
Modified: trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -463,7 +463,7 @@
# last step setup layers
if "ex_layer" in options:
- layer = [n==options["ex_layer"] for n in range(0,32)]
+ layer = [n == options["ex_layer"] for n in range(0, 32)]
else:
layer = list(arm.bones[bone_definition[1]].layer)
for attr in ex.attr_names:
Modified: trunk/blender/release/scripts/modules/rigify/stretch.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/stretch.py 2010-03-06 00:17:10 UTC (rev 27288)
+++ trunk/blender/release/scripts/modules/rigify/stretch.py 2010-03-06 01:40:29 UTC (rev 27289)
@@ -48,12 +48,11 @@
"no":False, "yes":True,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list