diff --git a/add_curve_ivygen.py b/add_curve_ivygen.py
index 10ba88d06b7dac0adb6e2326def6c0b5ade35928..49988fadbc970d52148fe3932ca3d0890393aeba 100644
--- a/add_curve_ivygen.py
+++ b/add_curve_ivygen.py
@@ -607,7 +607,7 @@ class IvyGen(bpy.types.Operator):
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 @@ class IvyGen(bpy.types.Operator):
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')
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 9a40de11ccb9f58f3bb2fe312236d6322c57c274..7ba313bce51f9f30717a470b6338d924499d74b4 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -82,6 +82,7 @@ class ImportSTL(bpy.types.Operator, ImportHelper):
directory = StringProperty(
subtype='DIR_PATH',
)
+
def execute(self, context):
from . import stl_utils
from . import blender_utils
diff --git a/io_scene_fbx/export_fbx.py b/io_scene_fbx/export_fbx.py
index 90555e100022437029a72278852d7c0a274a474b..df8522f5adc46d06d50aa37d92d8912e019bf55f 100644
--- a/io_scene_fbx/export_fbx.py
+++ b/io_scene_fbx/export_fbx.py
@@ -461,11 +461,11 @@ def save_single(operator, scene, filepath="",
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 @@ def save_single(operator, scene, filepath="",
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 @@ def save_single(operator, scene, filepath="",
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 @@ Connections: {''')
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)
diff --git a/mesh_inset/__init__.py b/mesh_inset/__init__.py
index d589cabdb86b9270d472d4b7c2f4dcd1c115f033..a9adbf3721828d6629d2b87329d82df4af07d62b 100644
--- a/mesh_inset/__init__.py
+++ b/mesh_inset/__init__.py
@@ -44,7 +44,10 @@ else:
import math
import bpy
import mathutils
-from bpy.props import *
+from bpy.props import (BoolProperty,
+ EnumProperty,
+ FloatProperty,
+ )
class Inset(bpy.types.Operator):
diff --git a/mocap/__init__.py b/mocap/__init__.py
index 99a9d4a89b628ce3c3f5dc8e19793c308b69b3e6..5a2405e44e250abf6178318ee0e3a93c7f2f4f3c 100644
--- a/mocap/__init__.py
+++ b/mocap/__init__.py
@@ -50,11 +50,9 @@ else:
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 @@ class MocapConstraint(bpy.types.PropertyGroup):
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 @@ class OBJECT_OT_RemoveMocapConstraint(bpy.types.Operator):
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 @@ class OBJECT_OT_BakeMocapConstraints(bpy.types.Operator):
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 @@ class OBJECT_OT_UnbakeMocapConstraints(bpy.types.Operator):
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 @@ class OBJECT_OT_UpdateMocapConstraints(bpy.types.Operator):
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
diff --git a/mocap/mocap_constraints.py b/mocap/mocap_constraints.py
index 4b6611bfe66cd75ea76212ede4c18273c9973c6c..58fbdbac8b9970f3bbd141ceb849796d337f7253 100644
--- a/mocap/mocap_constraints.py
+++ b/mocap/mocap_constraints.py
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from mathutils import *
+from mathutils import Vector
from bl_operators import nla
from . import retarget
diff --git a/mocap/retarget.py b/mocap/retarget.py
index 6e669434ae828f21f896f7a6df90b54fc5b57eef..f79810fdd68f08302c84b235eb81cd068ac8b7cc 100644
--- a/mocap/retarget.py
+++ b/mocap/retarget.py
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from mathutils import *
+from mathutils import Vector, Matrix
from math import radians, acos, pi
from bl_operators import nla
diff --git a/render_povray/ui.py b/render_povray/ui.py
index 95416c7eff782f40a1b479952db58c9fbe728261..0fa91a2b2ae9b90a68d5eefe680c9d48698974b3 100644
--- a/render_povray/ui.py
+++ b/render_povray/ui.py
@@ -193,7 +193,6 @@ class RENDER_PT_povray_export_settings(RenderButtonsPanel, bpy.types.Panel):
if scene.pov.indentation_character == "2":
split.prop(scene.pov, "indentation_spaces", text="Spaces")
-
row = layout.row()
row.prop(scene.pov, "comments_enable", text="Comments")
row.prop(scene.pov, "list_lf_enable", text="Line breaks in lists")