[Bf-blender-cvs] [bd59082462e] temp-vse-channels-edge-panning: Revert "fix warnings" - it did not help much, Fix incorrect boundbox calculation
Richard Antalik
noreply at git.blender.org
Wed Mar 9 18:10:51 CET 2022
Commit: bd59082462ed5d5f2a1554520dc9493496f8940b
Author: Richard Antalik
Date: Wed Mar 9 12:56:36 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBbd59082462ed5d5f2a1554520dc9493496f8940b
Revert "fix warnings" - it did not help much, Fix incorrect boundbox calculation
===================================================================
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/sequencer/intern/strip_time.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 1a5e96b97ff..810a6c809c4 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -625,13 +625,13 @@ static void sequencer_main_region_init(wmWindowManager *wm, ARegion *region)
}
/* Strip editing timeline. */
-static void sequencer_main_region_draw(bContext *C, ARegion *region)
+static void sequencer_main_region_draw(const bContext *C, ARegion *region)
{
draw_timeline_seq(C, region);
}
/* Strip editing timeline. */
-static void sequencer_main_region_draw_overlay(bContext *C, ARegion *region)
+static void sequencer_main_region_draw_overlay(const bContext *C, ARegion *region)
{
draw_timeline_seq_display(C, region);
}
@@ -644,7 +644,7 @@ struct View2DScrollers {
rcti _hor, _vert;
};
-static void sequencer_main_clamp_view(bContext *C, ARegion *region)
+static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
{
View2D *v2d = ®ion->v2d;
Editing *ed = SEQ_editing_get(CTX_data_scene(C));
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index 635f03add0b..c7fbdb0a679 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -442,7 +442,7 @@ void SEQ_timeline_expand_boundbox(const ListBase *seqbase, rctf *rect)
if (rect->xmax < seq->enddisp + 1) {
rect->xmax = seq->enddisp + 1;
}
- if (rect->ymax < seq->machine + 2) {
+ if (rect->ymax < seq->machine) {
rect->ymax = seq->machine;
}
}
More information about the Bf-blender-cvs
mailing list