diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-06-16 16:35:01 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-06-16 16:49:29 +0300 |
commit | 5ca3f3d81169911836820d2ecd857fbc66be7c84 (patch) | |
tree | 30cdfb2c5511e84072517591327866124f832922 /source | |
parent | c55cf743cdc68f4c1aeabba91d98a0bec96a62ef (diff) |
Partial Fix T44997: Propagate pose on selected keyframes only included those after the current frame
This behaviour was confusing, since "selected keyframes" suggests that it covers
all selected keyframes (instead of trying to do this based on frame ranges).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/armature/pose_slide.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 1a1108a2b1c..d583fd864b0 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -1173,13 +1173,20 @@ static void pose_propagate_fcurve(wmOperator *op, Object *ob, FCurve *fcu, * since it may be as of yet unkeyed * - if starting before the starting frame, don't touch the key, as it may have had some valid * values + * - if only doing selected keyframes, start from the first one */ - match = binarysearch_bezt_index(fcu->bezt, startFrame, fcu->totvert, &keyExists); - - if (fcu->bezt[match].vec[1][0] < startFrame) - i = match + 1; - else - i = match; + if (mode != POSE_PROPAGATE_SELECTED_KEYS) { + match = binarysearch_bezt_index(fcu->bezt, startFrame, fcu->totvert, &keyExists); + + if (fcu->bezt[match].vec[1][0] < startFrame) + i = match + 1; + else + i = match; + } + else { + /* selected - start from first keyframe */ + i = 0; + } for (bezt = &fcu->bezt[i]; i < fcu->totvert; i++, bezt++) { /* additional termination conditions based on the operator 'mode' property go here... */ |