diff options
Diffstat (limited to 'source/blender/editors/armature/pose_lib.c')
| -rw-r--r-- | source/blender/editors/armature/pose_lib.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index c8ce0774208..30f0b82396a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -498,7 +498,10 @@ static int poselib_add_exec(bContext *C, wmOperator *op) BLI_uniquename(&act->markers, marker, DATA_("Pose"), '.', offsetof(TimeMarker, name), sizeof(marker->name)); /* use Keying Set to determine what to store for the pose */ - ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_SELECTED_ID); /* this includes custom props :)*/ + + /* this includes custom props :)*/ + ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_SELECTED_ID); + ANIM_apply_keyingset(C, NULL, act, ks, MODIFYKEY_MODE_INSERT, (float)frame); /* store new 'active' pose number */ @@ -730,7 +733,8 @@ void POSELIB_OT_pose_rename(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - /* NOTE: name not pose is the operator's "main" property, so that it will get activated in the popup for easy renaming */ + /* NOTE: name not pose is the operator's "main" property, + * so that it will get activated in the popup for easy renaming */ ot->prop = RNA_def_string(ot->srna, "name", "RenamedPose", 64, "New Pose Name", "New name for pose"); prop = RNA_def_enum(ot->srna, "pose", DummyRNA_NULL_items, 0, "Pose", "The pose to rename"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); @@ -963,7 +967,8 @@ static void poselib_backup_restore(tPoseLib_PreviewData *pld) if (plb->oldprops) IDP_SyncGroupValues(plb->pchan->prop, plb->oldprops); - /* TODO: constraints settings aren't restored yet, even though these could change (though not that likely) */ + /* TODO: constraints settings aren't restored yet, + * even though these could change (though not that likely) */ } } @@ -1785,7 +1790,11 @@ void POSELIB_OT_browse_interactive(wmOperatorType *ot) // XXX: percentage vs factor? /* not used yet */ - /* RNA_def_float_factor(ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); */ +#if 0 + RNA_def_float_factor( + ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", + "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); +#endif } void POSELIB_OT_apply_pose(wmOperatorType *ot) |