[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2316] trunk/py/scripts/addons: pedantic pep8 edits
Campbell Barton
ideasman42 at gmail.com
Thu Sep 8 07:26:39 CEST 2011
Revision: 2316
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2316
Author: campbellbarton
Date: 2011-09-08 05:26:39 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
pedantic pep8 edits
Modified Paths:
--------------
trunk/py/scripts/addons/add_curve_ivygen.py
trunk/py/scripts/addons/io_mesh_stl/__init__.py
trunk/py/scripts/addons/io_scene_fbx/export_fbx.py
trunk/py/scripts/addons/mesh_inset/__init__.py
trunk/py/scripts/addons/mocap/__init__.py
trunk/py/scripts/addons/mocap/mocap_constraints.py
trunk/py/scripts/addons/mocap/retarget.py
trunk/py/scripts/addons/render_povray/ui.py
Modified: trunk/py/scripts/addons/add_curve_ivygen.py
===================================================================
--- trunk/py/scripts/addons/add_curve_ivygen.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/add_curve_ivygen.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -607,7 +607,7 @@
def draw(self, context):
layout = self.layout
-
+
layout.prop(self, 'updateIvy', icon='CURVE_DATA')
properties = layout.operator('curve.ivy_gen', text="Add New Ivy")
@@ -636,21 +636,21 @@
box.label("Generation Settings:")
box.prop(self, 'randomSeed')
box.prop(self, 'maxTime')
-
+
box = layout.box()
box.label("Size Settings:")
box.prop(self, 'maxIvyLength')
box.prop(self, 'ivySize')
box.prop(self, 'maxFloatLength')
box.prop(self, 'maxAdhesionDistance')
-
+
box = layout.box()
box.label("Weight Settings:")
box.prop(self, 'primaryWeight')
box.prop(self, 'randomWeight')
box.prop(self, 'gravityWeight')
box.prop(self, 'adhesionWeight')
-
+
box = layout.box()
box.label("Branch Settings:")
box.prop(self, 'branchingProbability')
Modified: trunk/py/scripts/addons/io_mesh_stl/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_stl/__init__.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/io_mesh_stl/__init__.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -82,6 +82,7 @@
directory = StringProperty(
subtype='DIR_PATH',
)
+
def execute(self, context):
from . import stl_utils
from . import blender_utils
Modified: trunk/py/scripts/addons/io_scene_fbx/export_fbx.py
===================================================================
--- trunk/py/scripts/addons/io_scene_fbx/export_fbx.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/io_scene_fbx/export_fbx.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -461,11 +461,11 @@
loc = tuple(loc)
rot = tuple(rot.to_euler()) # quat -> euler
scale = tuple(scale)
-
+
# Essential for XNA to use the original matrix not rotated nor scaled (JCB)
if use_rotate_workaround:
matrix = ob.matrix_local
-
+
else:
# This is bad because we need the parent relative matrix from the fbx parent (if we have one), dont use anymore
#if ob and not matrix: matrix = ob.matrix_world * global_matrix
@@ -1042,7 +1042,7 @@
poseMatrix = write_object_props()[3]
pose_items.append((fbxName, poseMatrix))
-
+
fw('\n\t\t}'
'\n\t\tMultiLayer: 0'
'\n\t\tMultiTake: 1'
@@ -2080,7 +2080,7 @@
del tmp_obmapping
# Finished finding groups we use
-
+
# == WRITE OBJECTS TO THE FILE ==
# == From now on we are building the FBX file from the information collected above (JCB)
@@ -2446,7 +2446,6 @@
for fbxGroupName in ob_base.fbxGroupNames:
fw('\n\tConnect: "OO", "Model::%s", "GroupSelection::%s"' % (ob_base.fbxName, fbxGroupName))
-
# I think the following always duplicates the armature connection because it is also in ob_all_typegroups above! (JCB)
# for my_arm in ob_arms:
# fw('\n\tConnect: "OO", "Model::%s", "Model::Scene"' % my_arm.fbxName)
Modified: trunk/py/scripts/addons/mesh_inset/__init__.py
===================================================================
--- trunk/py/scripts/addons/mesh_inset/__init__.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/mesh_inset/__init__.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -44,7 +44,10 @@
import math
import bpy
import mathutils
-from bpy.props import *
+from bpy.props import (BoolProperty,
+ EnumProperty,
+ FloatProperty,
+ )
class Inset(bpy.types.Operator):
Modified: trunk/py/scripts/addons/mocap/__init__.py
===================================================================
--- trunk/py/scripts/addons/mocap/__init__.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/mocap/__init__.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -50,11 +50,9 @@
PointerProperty,
StringProperty,
)
- from bpy import *
from . import mocap_constraints
from . import retarget
from . import mocap_tools
- from .mocap_constraints import *
# MocapConstraint class
# Defines MocapConstraint datatype, used to add and configute mocap constraints
@@ -65,66 +63,66 @@
name = StringProperty(name="Name",
default="Mocap Fix",
description="Name of Mocap Fix",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
constrained_bone = StringProperty(name="Bone",
default="",
description="Constrained Bone",
- update=updateConstraintBoneType)
+ update=mocap_constraints.updateConstraintBoneType)
constrained_boneB = StringProperty(name="Bone (2)",
default="",
description="Other Constrained Bone (optional, depends on type)",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
s_frame = IntProperty(name="S",
default=0,
description="Start frame of Fix",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
e_frame = IntProperty(name="E",
default=100,
description="End frame of Fix",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
smooth_in = IntProperty(name="In",
default=10,
description="Amount of frames to smooth in",
- update=setConstraint,
+ update=mocap_constraints.setConstraint,
min=0)
smooth_out = IntProperty(name="Out",
default=10,
description="Amount of frames to smooth out",
- update=setConstraint,
+ update=mocap_constraints.setConstraint,
min=0)
targetMesh = StringProperty(name="Mesh",
default="",
description="Target of Fix - Mesh (optional, depends on type)",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
active = BoolProperty(name="Active",
default=True,
description="Fix is active",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
show_expanded = BoolProperty(name="Show Expanded",
default=True,
description="Fix is fully shown")
targetPoint = FloatVectorProperty(name="Point", size=3,
subtype="XYZ", default=(0.0, 0.0, 0.0),
description="Target of Fix - Point",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
targetDist = FloatProperty(name="Offset",
default=0.0,
description="Distance and Floor Fixes - Desired offset",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
targetSpace = EnumProperty(
items=[("WORLD", "World Space", "Evaluate target in global space"),
("LOCAL", "Object space", "Evaluate target in object space"),
("constrained_boneB", "Other Bone Space", "Evaluate target in specified other bone space")],
name="Space",
description="In which space should Point type target be evaluated",
- update=setConstraint)
+ update=mocap_constraints.setConstraint)
type = EnumProperty(name="Type of constraint",
items=[("point", "Maintain Position", "Bone is at a specific point"),
("freeze", "Maintain Position at frame", "Bone does not move from location specified in target frame"),
("floor", "Stay above", "Bone does not cross specified mesh object eg floor"),
("distance", "Maintain distance", "Target bones maintained specified distance")],
description="Type of Fix",
- update=updateConstraintBoneType)
+ update=mocap_constraints.updateConstraintBoneType)
real_constraint = StringProperty()
real_constraint_bone = StringProperty()
@@ -704,8 +702,8 @@
m_constraint = m_constraints[self.constraint]
if m_constraint.real_constraint:
bone = enduser_obj.pose.bones[m_constraint.real_constraint_bone]
- cons_obj = getConsObj(bone)
- removeConstraint(m_constraint, cons_obj)
+ cons_obj = mocap_constraints.getConsObj(bone)
+ mocap_constraints.removeConstraint(m_constraint, cons_obj)
m_constraints.remove(self.constraint)
return {"FINISHED"}
@@ -722,7 +720,7 @@
bl_label = "Bake all fixes to target armature"
def execute(self, context):
- bakeConstraints(context)
+ mocap_constraints.bakeConstraints(context)
return {"FINISHED"}
@classmethod
@@ -738,7 +736,7 @@
bl_label = "Unbake all fixes to target armature"
def execute(self, context):
- unbakeConstraints(context)
+ mocap_constraints.unbakeConstraints(context)
return {"FINISHED"}
@classmethod
@@ -755,7 +753,7 @@
bl_label = "Updates all fixes to target armature - neccesary to take under consideration changes to armature object or pose"
def execute(self, context):
- updateConstraints(context.active_object, context)
+ mocap_constraints.updateConstraints(context.active_object, context)
return {"FINISHED"}
@classmethod
Modified: trunk/py/scripts/addons/mocap/mocap_constraints.py
===================================================================
--- trunk/py/scripts/addons/mocap/mocap_constraints.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/mocap/mocap_constraints.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from mathutils import *
+from mathutils import Vector
from bl_operators import nla
from . import retarget
Modified: trunk/py/scripts/addons/mocap/retarget.py
===================================================================
--- trunk/py/scripts/addons/mocap/retarget.py 2011-09-07 14:28:37 UTC (rev 2315)
+++ trunk/py/scripts/addons/mocap/retarget.py 2011-09-08 05:26:39 UTC (rev 2316)
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list