diff --git a/mocap/__init__.py b/mocap/__init__.py index 7dfd8d23fc0a9885fc8974ed95f6603ec9430209..70fb4c6e11ac985b856f8543e9a86b68e74525ac 100644 --- a/mocap/__init__.py +++ b/mocap/__init__.py @@ -21,11 +21,11 @@ bl_info = { "name": "Motion Capture Tools", "author": "Benjy Cook", - "blender": (2, 5, 9), + "blender": (2, 6, 2), "location": "Object UI -> Mocap tools", "description": "Various tools for working with motion capture animation", "warning": "", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Animation/Motion_Capture_Tools", + "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Animation/Motion_Capture_Tools", "tracker_url": "http://projects.blender.org/tracker/index.php?func=detail&aid=28321", "support": 'OFFICIAL', "category": "Animation"} @@ -312,7 +312,7 @@ class MocapPanel(bpy.types.Panel): for bone in perf.bones: footCol.prop(data=bone, property='foot', text='', icon='POSE_DATA') nameCol.label(bone.name) - mapCol.prop_search(bone, "map", enduser_arm, "bones") + mapCol.prop_search(bone, "map", enduser_arm, "bones", text='') selectCol.operator("mocap.selectmap", text='', icon='CURSOR').perf_bone = bone.name label_mod = "FK" if bone.map: @@ -370,7 +370,7 @@ class MocapConstraintsPanel(bpy.types.Panel): headerRow.operator("mocap.removeconstraint", text="", icon='X', emboss=False).constraint = i if m_constraint.show_expanded: box.separator() - box.prop_search(m_constraint, 'constrained_bone', enduser_obj.pose, "bones", icon='BONE_DATA') + box.prop_search(m_constraint, 'constrained_bone', enduser_obj.pose, "bones", icon='BONE_DATA',text='') if m_constraint.type == "distance" or m_constraint.type == "point": box.prop_search(m_constraint, 'constrained_boneB', enduser_obj.pose, "bones", icon='CONSTRAINT_BONE') frameRow = box.row() diff --git a/mocap/retarget.py b/mocap/retarget.py index c576f152f6baca9f5cb2fabb1ba0ed48884939dd..66c6228006296106b9dbb21abdeed9014923c93c 100644 --- a/mocap/retarget.py +++ b/mocap/retarget.py @@ -307,7 +307,6 @@ def copyTranslation(performer_obj, enduser_obj, perfFeet, root, s_frame, e_frame def IKRetarget(performer_obj, enduser_obj, s_frame, e_frame, scene, step): - bpy.ops.object.select_pattern(pattern=enduser_obj.name, extend=False) end_bones = enduser_obj.pose.bones for pose_bone in end_bones: ik_constraint = hasIKConstraint(pose_bone) @@ -529,6 +528,10 @@ def totalRetarget(performer_obj, enduser_obj, scene, s_frame, e_frame): print("Second pass: retargeting root translation and clean up") stride_bone = copyTranslation(performer_obj, enduser_obj, feetBones, root, s_frame, e_frame, scene, enduser_obj_mat) if not advanced: + print("hry") + bpy.ops.object.select_all(action='DESELECT') + bpy.context.scene.objects.active = enduser_obj + bpy.ops.object.select_pattern(pattern=enduser_obj.name, extend=False) IKRetarget(performer_obj, enduser_obj, s_frame, e_frame, scene, step) bpy.ops.object.select_pattern(pattern=stride_bone.name, extend=False) restoreObjMat(performer_obj, enduser_obj, perf_obj_mat, enduser_obj_mat, stride_bone, scene, s_frame)