[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38157] branches/soc-2011-pepper/release/ scripts/modules: pep8 compliance for python scripts
Benjy Cook
benjycook at hotmail.com
Wed Jul 6 16:20:38 CEST 2011
Revision: 38157
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38157
Author: benjycook
Date: 2011-07-06 14:20:38 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
pep8 compliance for python scripts
Modified Paths:
--------------
branches/soc-2011-pepper/release/scripts/modules/mocap_constraints.py
branches/soc-2011-pepper/release/scripts/modules/mocap_tools.py
Modified: branches/soc-2011-pepper/release/scripts/modules/mocap_constraints.py
===================================================================
--- branches/soc-2011-pepper/release/scripts/modules/mocap_constraints.py 2011-07-06 14:19:54 UTC (rev 38156)
+++ branches/soc-2011-pepper/release/scripts/modules/mocap_constraints.py 2011-07-06 14:20:38 UTC (rev 38157)
@@ -96,7 +96,7 @@
# Function that copies all settings from m_constraint to the real Blender constraints
# Is only called when blender constraint already exists
-def setConstraintFraming(m_constraint, cons_obj):
+def setConstraintFraming(m_constraint, cons_obj, real_constraint):
if isinstance(cons_obj, bpy.types.PoseBone):
fcurves = obj.animation_data.action.fcurves
else:
@@ -118,6 +118,7 @@
real_constraint.keyframe_insert(data_path="influence", frame=s - s_in)
real_constraint.keyframe_insert(data_path="influence", frame=e + s_out)
+
def setConstraint(m_constraint):
if not m_constraint.constrained_bone:
return
@@ -128,8 +129,8 @@
real_constraint = cons_obj.constraints[m_constraint.real_constraint]
#frame changing section
- setConstraintFraming(m_constraint, cons_obj)
-
+ setConstraintFraming(m_constraint, cons_obj, real_constraint)
+
#Set the blender constraint parameters
if m_constraint.type == "point":
real_constraint.owner_space = m_constraint.targetSpace
@@ -149,7 +150,7 @@
if m_constraint.type == "freeze":
real_constraint.owner_space = m_constraint.targetSpace
- bpy.context.scene.frame_set(s)
+ bpy.context.scene.frame_set(m_constraint.s_frame)
if isinstance(cons_obj, bpy.types.PoseBone):
x, y, z = cons_obj.center + (cons_obj.vector / 2)
else:
@@ -173,7 +174,6 @@
real_constraint.target = getConsObj(bones[m_constraint.constrained_boneB])
real_constraint.limit_mode = "LIMITDIST_ONSURFACE"
real_constraint.distance = m_constraint.targetDist
-
# active check
real_constraint.mute = not m_constraint.active
Modified: branches/soc-2011-pepper/release/scripts/modules/mocap_tools.py
===================================================================
--- branches/soc-2011-pepper/release/scripts/modules/mocap_tools.py 2011-07-06 14:19:54 UTC (rev 38156)
+++ branches/soc-2011-pepper/release/scripts/modules/mocap_tools.py 2011-07-06 14:20:38 UTC (rev 38157)
@@ -550,22 +550,20 @@
def rotate_fix_armature(arm_data):
- global_matrix = Matrix.Rotation(radians(90),4,"X")
+ global_matrix = Matrix.Rotation(radians(90), 4, "X")
bpy.ops.object.mode_set(mode='EDIT', toggle=False)
- if global_matrix!=Matrix(): #optimization: this might not be needed.
- #disconnect all bones for ease of global rotation
- connectedBones = []
- for bone in arm_data.edit_bones:
- if bone.use_connect:
- connectedBones.append(bone.name)
- bone.use_connect=False
+ #disconnect all bones for ease of global rotation
+ connectedBones = []
+ for bone in arm_data.edit_bones:
+ if bone.use_connect:
+ connectedBones.append(bone.name)
+ bone.use_connect = False
- #rotate all the bones around their center
- for bone in arm_data.edit_bones:
- bone.transform(global_matrix)
+ #rotate all the bones around their center
+ for bone in arm_data.edit_bones:
+ bone.transform(global_matrix)
- #reconnect the bones
- for bone in connectedBones:
- arm_data.edit_bones[bone].use_connect=True
-
- bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
\ No newline at end of file
+ #reconnect the bones
+ for bone in connectedBones:
+ arm_data.edit_bones[bone].use_connect = True
+ bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
More information about the Bf-blender-cvs
mailing list