[Bf-blender-cvs] [7cc1f1de212] temp-vse-channels-edge-panning: Use smoothview for delete operator, fix warnings
Richard Antalik
noreply at git.blender.org
Wed Mar 9 18:10:51 CET 2022
Commit: 7cc1f1de212993658d99acd03497852f98546143
Author: Richard Antalik
Date: Wed Mar 9 12:32:34 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rB7cc1f1de212993658d99acd03497852f98546143
Use smoothview for delete operator, fix warnings
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index a95980f99eb..f06505c291e 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1767,6 +1767,9 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op))
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
DEG_relations_tag_update(bmain);
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
+ SpaceSeq *sseq = CTX_wm_space_seq(C);
+ sseq->flag |= SPACE_SEQ_CLAMP_SMOOTH;
+
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 6bf91c21285..1a5e96b97ff 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(const bContext *C, ARegion *region)
+static void sequencer_main_region_draw(bContext *C, ARegion *region)
{
draw_timeline_seq(C, region);
}
/* Strip editing timeline. */
-static void sequencer_main_region_draw_overlay(const bContext *C, ARegion *region)
+static void sequencer_main_region_draw_overlay(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(const bContext *C, ARegion *region)
+static void sequencer_main_clamp_view(bContext *C, ARegion *region)
{
View2D *v2d = ®ion->v2d;
Editing *ed = SEQ_editing_get(CTX_data_scene(C));
@@ -702,12 +702,15 @@ static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
if (do_clamp) {
if ((sseq->flag & SPACE_SEQ_CLAMP_SMOOTH) != 0) {
UI_view2d_smooth_view(C, region, &view_clamped, U.smooth_viewtx);
- sseq->flag &= ~SPACE_SEQ_CLAMP_SMOOTH;
}
else {
v2d->cur = view_clamped;
}
}
+
+ /* Clear flag for smooth view even if no limiting occured. It is set by operators that change
+ * strip position. */
+ sseq->flag &= ~SPACE_SEQ_CLAMP_SMOOTH;
}
static void sequencer_main_region_layout(const bContext *C, ARegion *region)
More information about the Bf-blender-cvs
mailing list