Commit: 5501a5de32db99a944fc6edfb02e3ba2d07de772 Author: Olivier Jolly Date: Mon Jan 25 05:51:36 2021 +0100 Branches: blender-v2.92-release https://developer.blender.org/rB5501a5de32db99a944fc6edfb02e3ba2d07de772
Fix T84705: Snapping strip handle offset animation Only offset animation if whole strip is snapped. Bug introduced in e36c05b3d191. Reviewed By: ISS Differential Revision: https://developer.blender.org/D10116 =================================================================== M source/blender/editors/space_sequencer/sequencer_edit.c =================================================================== diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 4f9fbc44631..f470d1913dc 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -324,19 +324,27 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) } } - /* Recalculate bounds of effect strips. */ + /* Recalculate bounds of effect strips, offsetting the keyframes if not snapping any handle. */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->type & SEQ_TYPE_EFFECT) { + const bool either_handle_selected = (seq->flag & (SEQ_LEFTSEL | SEQ_RIGHTSEL)) != 0; + if (seq->seq1 && (seq->seq1->flag & SELECT)) { - SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + if (!either_handle_selected) { + SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + } SEQ_time_update_sequence(scene, seq); } else if (seq->seq2 && (seq->seq2->flag & SELECT)) { - SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + if (!either_handle_selected) { + SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + } SEQ_time_update_sequence(scene, seq); } else if (seq->seq3 && (seq->seq3->flag & SELECT)) { - SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + if (!either_handle_selected) { + SEQ_offset_animdata(scene, seq, (snap_frame - seq->startdisp)); + } SEQ_time_update_sequence(scene, seq); } } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
