Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2021-10-25 05:33:43 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-10-25 05:33:43 +0300
commit4266538ab980fc475a6fd295892b1ad48ee2b7dd (patch)
tree9eacffbf19bfe3cf57cfe2befafe402ebbc2bfd2
parent28ad680ff06677778e85204e00bafb789402491b (diff)
Fix T90835: Strip snaps to first and second frame
This was caused by strips with single frame input like single image strip or color strip. their length is always 1, and so content length was calculated to end after first frame. There was code handling this case, but it was also checking for `anim_endofs` and `endstill` values. Anim offset values have no effect on these strips and still frame value was used incorrectly. So these chacks can be removed completely.
-rw-r--r--source/blender/editors/transform/transform_snap_sequencer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_snap_sequencer.c b/source/blender/editors/transform/transform_snap_sequencer.c
index d752e26088e..7bcf6812ce9 100644
--- a/source/blender/editors/transform/transform_snap_sequencer.c
+++ b/source/blender/editors/transform/transform_snap_sequencer.c
@@ -220,12 +220,8 @@ static void seq_snap_target_points_build(const TransInfo *t,
int content_end = max_ii(seq->startdisp, seq->start + seq->len);
/* Effects and single image strips produce incorrect content length. Skip these strips. */
if ((seq->type & SEQ_TYPE_EFFECT) != 0 || seq->len == 1) {
- if (seq->anim_startofs == 0 && seq->startstill == 0) {
- content_start = seq->startdisp;
- }
- if (seq->anim_endofs == 0 && seq->endstill == 0) {
- content_end = seq->enddisp;
- }
+ content_start = seq->startdisp;
+ content_end = seq->enddisp;
}
CLAMP(content_start, seq->startdisp, seq->enddisp);