diff options
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_naming.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_lib.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_transform.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 5 |
5 files changed, 4 insertions, 33 deletions
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 8bcaf72f678..70154695dcd 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -525,8 +525,8 @@ void ARMATURE_OT_flip_names(wmOperatorType *ot) "do_strip_numbers", false, "Strip Numbers", - "Try to remove right-most dot-number from flipped names " - "(WARNING: may result in incoherent naming in some cases)"); + "Try to remove right-most dot-number from flipped names.\n" + "Warning: May result in incoherent naming in some cases"); } /** \} */ diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index e65871c0896..f5daa427149 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -593,8 +593,8 @@ void POSE_OT_flip_names(wmOperatorType *ot) "do_strip_numbers", false, "Strip Numbers", - "Try to remove right-most dot-number from flipped names " - "(WARNING: may result in incoherent naming in some cases)"); + "Try to remove right-most dot-number from flipped names.\n" + "Warning: May result in incoherent naming in some cases"); } /* ------------------ */ diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index dd90f9f2cc3..21fcbf8886b 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -1108,17 +1108,6 @@ static void poselib_keytag_pose(bContext *C, Scene *scene, tPoseLib_PreviewData if (autokey) { /* Add data-source override for the PoseChannel, to be used later. */ ANIM_relative_keyingset_add_source(&dsources, &pld->ob->id, &RNA_PoseBone, pchan); - - /* clear any unkeyed tags */ - if (pchan->bone) { - pchan->bone->flag &= ~BONE_UNKEYED; - } - } - else { - /* add unkeyed tags */ - if (pchan->bone) { - pchan->bone->flag |= BONE_UNKEYED; - } } } } diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 8d1c196e9c2..43ab20eb71c 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -172,9 +172,6 @@ static void applyarmature_transfer_properties(EditBone *curbone, unit_qt(pchan->quat); unit_axis_angle(pchan->rotAxis, &pchan->rotAngle); pchan->size[0] = pchan->size[1] = pchan->size[2] = 1.0f; - - /* Set anim lock. */ - curbone->flag |= BONE_UNKEYED; } /* Adjust the current edit position of the bone using the pose space matrix. */ @@ -1200,10 +1197,6 @@ static int pose_clear_transform_generic_exec(bContext *C, /* do auto-keyframing as appropriate */ if (autokeyframe_cfra_can_key(scene, &ob_iter->id)) { - /* clear any unkeyed tags */ - if (pchan->bone) { - pchan->bone->flag &= ~BONE_UNKEYED; - } /* tag for autokeying later */ ANIM_relative_keyingset_add_source(&dsources, &ob_iter->id, &RNA_PoseBone, pchan); @@ -1212,12 +1205,6 @@ static int pose_clear_transform_generic_exec(bContext *C, clear_func(ob_iter->pose, pchan_eval); #endif } - else { - /* add unkeyed tags */ - if (pchan->bone) { - pchan->bone->flag |= BONE_UNKEYED; - } - } } FOREACH_PCHAN_SELECTED_IN_OBJECT_END; diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index c75e9c9ef69..75348c2b196 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -313,11 +313,6 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, ListBase *pfLinks, /* Add data-source override for the PoseChannel, to be used later. */ ANIM_relative_keyingset_add_source(&dsources, &pfl->ob->id, &RNA_PoseBone, pchan); - - /* clear any unkeyed tags */ - if (pchan->bone) { - pchan->bone->flag &= ~BONE_UNKEYED; - } } /* insert keyframes for all relevant bones in one go */ |