[Bf-blender-cvs] [eb98bd2e7d5] temp-vse-channels-edge-panning: remove change that should be in D14263
Richard Antalik
noreply at git.blender.org
Thu Mar 24 02:35:44 CET 2022
Commit: eb98bd2e7d5a5ea086dbe22796f87caaf40f5b01
Author: Richard Antalik
Date: Tue Mar 8 15:43:22 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBeb98bd2e7d5a5ea086dbe22796f87caaf40f5b01
remove change that should be in D14263
===================================================================
M source/blender/sequencer/SEQ_relations.h
M source/blender/sequencer/intern/strip_time.c
===================================================================
diff --git a/source/blender/sequencer/SEQ_relations.h b/source/blender/sequencer/SEQ_relations.h
index 5cd9c6c6c1f..735b5659ca9 100644
--- a/source/blender/sequencer/SEQ_relations.h
+++ b/source/blender/sequencer/SEQ_relations.h
@@ -38,7 +38,6 @@ void SEQ_relations_invalidate_cache_in_range(struct Scene *scene,
struct Sequence *seq,
struct Sequence *range_mask,
int invalidate_types);
-
/**
* Release FFmpeg handles of strips that are not currently displayed to minimize memory usage.
*/
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index 6807b656ac3..f5bb038c249 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -445,7 +445,7 @@ void SEQ_timeline_expand_boundbox(const ListBase *seqbase, rctf *rect)
rect->xmax = seq->enddisp + 1;
}
if (rect->ymax < seq->machine) {
- rect->ymax = seq->machine;
+ rect->ymax = seq->machine + 2;
}
}
}
More information about the Bf-blender-cvs
mailing list