[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27989] trunk/blender/release/scripts: pep8 cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Apr 4 16:52:15 CEST 2010
Revision: 27989
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27989
Author: campbellbarton
Date: 2010-04-04 16:52:15 +0200 (Sun, 04 Apr 2010)
Log Message:
-----------
pep8 cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/io/import_shape_mdd.py
trunk/blender/release/scripts/modules/rigify/__init__.py
trunk/blender/release/scripts/modules/rigify/stretch.py
trunk/blender/release/scripts/op/image.py
trunk/blender/release/scripts/op/nla.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_physics_cloth.py
trunk/blender/release/scripts/ui/properties_physics_fluid.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_image.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
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/io/import_shape_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/import_shape_mdd.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/io/import_shape_mdd.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -45,11 +45,11 @@
frames, points = unpack(">2i", file.read(8))
time = unpack((">%df" % frames), file.read(frames * 4))
- print('\tpoints:%d frames:%d' % (points,frames))
+ print('\tpoints:%d frames:%d' % (points, frames))
# If target object doesn't have Basis shape key, create it.
try:
- num_keys = len( ob.data.shape_keys.keys )
+ num_keys = len(ob.data.shape_keys.keys)
except:
basis = ob.add_shape_key()
basis.name = "Basis"
@@ -68,13 +68,11 @@
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
+ 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
+ for v in verts: # 12 is the size of 3 floats
+ v.co[:] = unpack('>3f', file.read(12))
#me.update()
ob.shape_key_lock = False
@@ -122,7 +120,6 @@
#fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25)
frame_start = IntProperty(name="Start Frame", description="Start frame for inserting animation", min=minframe, max=maxframe, default=0)
-
def poll(self, context):
ob = context.active_object
return (ob and ob.type == 'MESH')
@@ -131,7 +128,7 @@
if not self.properties.path:
raise Exception("filename not set")
- mdd_import( self.properties.path, bpy.context.active_object, context.scene, self.properties.frame_start, 1)
+ mdd_import(self.properties.path, bpy.context.active_object, context.scene, self.properties.frame_start, 1)
return {'FINISHED'}
@@ -149,6 +146,7 @@
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-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/modules/rigify/__init__.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -234,12 +234,12 @@
bone_gen = obj.pose.bones[bone.name]
# Rotation mode and transform locks
- bone_gen.rotation_mode = bone.rotation_mode
- bone_gen.lock_rotation = tuple(bone.lock_rotation)
- bone_gen.lock_rotation_w = bone.lock_rotation_w
+ bone_gen.rotation_mode = bone.rotation_mode
+ bone_gen.lock_rotation = tuple(bone.lock_rotation)
+ bone_gen.lock_rotation_w = bone.lock_rotation_w
bone_gen.lock_rotations_4d = bone.lock_rotations_4d
- bone_gen.lock_location = tuple(bone.lock_location)
- bone_gen.lock_scale = tuple(bone.lock_scale)
+ bone_gen.lock_location = tuple(bone.lock_location)
+ bone_gen.lock_scale = tuple(bone.lock_scale)
# Custom properties
for prop in bone.keys():
Modified: trunk/blender/release/scripts/modules/rigify/stretch.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/stretch.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/modules/rigify/stretch.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -41,12 +41,12 @@
# pbone = obj.pose.bones['Bone']
# pbone['type'] = 'copy'
-bool_map = {0:False, 1:True,
- 0.0:False, 1.0:True,
- "false":False, "true":True,
- "False":False, "True":True,
- "no":False, "yes":True,
- "No":False, "Yes":True}
+bool_map = {0: False, 1: True,
+ 0.0: False, 1.0: True,
+ "false": False, "true": True,
+ "False": False, "True": True,
+ "no": False, "yes": True,
+ "No": False, "Yes": True}
def metarig_definition(obj, orig_bone_name):
Modified: trunk/blender/release/scripts/op/image.py
===================================================================
--- trunk/blender/release/scripts/op/image.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/op/image.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -21,6 +21,7 @@
import bpy
from bpy.props import StringProperty
+
class EditExternally(bpy.types.Operator):
'''Edit image in an external application'''
bl_idname = "image.external_edit"
@@ -74,7 +75,7 @@
self.properties.path = path
self.execute(context)
-
+
return {'FINISHED'}
@@ -187,6 +188,7 @@
ProjectEdit,
ProjectApply]
+
def register():
register = bpy.types.register
for cls in classes:
Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/op/nla.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -20,6 +20,7 @@
import bpy
+
def pose_info():
from Mathutils import Matrix
@@ -42,14 +43,14 @@
binfo["matrix_local_inv"] = binfo["matrix_local"].copy().invert()
except:
binfo["matrix_local_inv"] = Matrix()
-
+
binfo["matrix"] = bone.matrix.copy()
binfo["matrix_pose"] = pbone.matrix.copy()
try:
binfo["matrix_pose_inv"] = binfo["matrix_pose"].copy().invert()
except:
binfo["matrix_pose_inv"] = Matrix()
-
+
print(binfo["matrix_pose"])
info[name] = binfo
@@ -58,13 +59,13 @@
binfo_parent = binfo.get("parent", None)
if binfo_parent:
binfo_parent = info[binfo_parent]
-
+
matrix = binfo["matrix_pose"]
rest_matrix = binfo["matrix_local"]
if binfo_parent:
- matrix= binfo_parent["matrix_pose_inv"] * matrix
- rest_matrix= binfo_parent["matrix_local_inv"] * rest_matrix
+ matrix = binfo_parent["matrix_pose_inv"] * matrix
+ rest_matrix = binfo_parent["matrix_local_inv"] * rest_matrix
matrix = rest_matrix.copy().invert() * matrix
@@ -81,13 +82,13 @@
pose = obj.pose
info_ls = []
-
+
frame_range = range(frame_start, frame_end + 1, step)
# could spped this up by applying steps here too...
for f in frame_range:
scene.set_frame(f)
-
+
info = pose_info()
info_ls.append(info)
f += 1
@@ -103,16 +104,16 @@
continue
for f in frame_range:
- matrix = info_ls[int((f-frame_start) / step)][name]["matrix_key"]
+ matrix = info_ls[int((f - frame_start) / step)][name]["matrix_key"]
#pbone.location = matrix.translation_part()
#pbone.rotation_quaternion = matrix.to_quat()
pbone.matrix_local = [f for v in matrix for f in v]
pbone.keyframe_insert("location", -1, f)
-
+
rotation_mode = pbone.rotation_mode
-
+
if rotation_mode == 'QUATERNION':
pbone.keyframe_insert("rotation_quaternion", -1, f)
elif rotation_mode == 'AXIS_ANGLE':
@@ -165,7 +166,7 @@
props = self.properties
action = bake(props.frame_start, props.frame_end, props.step, props.only_selected)
-
+
# basic cleanup, could move elsewhere
for fcu in action.fcurves:
keyframe_points = fcu.keyframe_points
@@ -201,4 +202,4 @@
# bpy.types.INFO_MT_mesh_add.remove(menu_func)
if __name__ == "__main__":
- register()
\ No newline at end of file
+ register()
Modified: trunk/blender/release/scripts/op/screen_play_rendered_anim.py
===================================================================
--- trunk/blender/release/scripts/op/screen_play_rendered_anim.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/op/screen_play_rendered_anim.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -89,11 +89,11 @@
if is_movie == False and preset in ('FRAMECYCLER', 'RV', 'MPLAYER'):
# replace the number with '#'
file_a = rd.frame_path(frame=0)
-
+
# TODO, make an api call for this
frame_tmp = 9
file_b = rd.frame_path(frame=frame_tmp)
-
+
while len(file_a) == len(file_b):
frame_tmp = (frame_tmp * 10) + 9
print(frame_tmp)
Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -497,14 +497,14 @@
def SCREW(self, layout, ob, md, wide_ui):
split = layout.split()
-
+
col = split.column()
col.prop(md, "axis")
col.prop(md, "object", text="AxisOb")
col.prop(md, "angle")
col.prop(md, "steps")
col.prop(md, "render_steps")
-
+
if wide_ui:
col = split.column()
row = col.row()
@@ -516,7 +516,6 @@
col.prop(md, "use_normal_calculate")
col.prop(md, "use_normal_flip")
col.prop(md, "iterations")
-
def SHRINKWRAP(self, layout, ob, md, wide_ui):
split = layout.split()
Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py 2010-04-04 14:33:41 UTC (rev 27988)
+++ trunk/blender/release/scripts/ui/properties_object.py 2010-04-04 14:52:15 UTC (rev 27989)
@@ -272,6 +272,8 @@
layout.prop(ob, "dupli_group", text="")
# XXX: the following options are all quite buggy, ancient hacks that should be dropped
+
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list