From f37518d90243d297d855901a6ab2dfaf57b43094 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 May 2010 17:23:37 +0000 Subject: [PATCH] bugfix [#22311] BVH Import broken from Stig Olavsen & Tod Liverseed --- release/scripts/io/import_anim_bvh.py | 4 +--- release/scripts/keyingsets/keyingsets_utils.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index bab692f9daf..eb61085a957 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -459,12 +459,10 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM pose_bone.rotation_mode = eul_order_lookup[tuple(bvh_node.rot_order)] elif ROT_MODE == 'XYZ': - print(2) for pose_bone in pose_bones: pose_bone.rotation_mode = 'XYZ' else: # Quats default - print(3) pass context.scene.update() @@ -520,7 +518,7 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM lx, ly, lz, rx, ry, rz = bvh_node.anim_data[frame_current + 1] if bvh_node.has_rot: - bone_rotation_matrix = Euler(rx, ry, rz).to_matrix().resize4x4() + bone_rotation_matrix = Euler((rx, ry, rz)).to_matrix().resize4x4() bone_rotation_matrix = bone_rest_matrix_inv * bone_rotation_matrix * bone_rest_matrix if ROT_MODE == 'QUATERNION': diff --git a/release/scripts/keyingsets/keyingsets_utils.py b/release/scripts/keyingsets/keyingsets_utils.py index 777f5f052e2..77b0f3ebacd 100644 --- a/release/scripts/keyingsets/keyingsets_utils.py +++ b/release/scripts/keyingsets/keyingsets_utils.py @@ -26,7 +26,7 @@ def RKS_POLL_selected_objects(ksi, context): def RKS_POLL_selected_bones(ksi, context): # we must be in Pose Mode, and there must be some bones selected if (context.active_object) and (context.active_object.mode == 'POSE'): - if context.active_pose_bone or len(context.select_pose_bones): + if context.active_pose_bone or len(context.selected_pose_bones): return True; # nothing selected