From 4b2e6d4e22dc16cd521da777bd4493b49f34e034 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Thu, 18 Jul 2019 15:25:37 +0200 Subject: Fix T67062: Movie Clip Editor does not update Editor Type when changing Editing Context Previously when switching modes, the code didn't check if we were in the correct view for the masking mode. Reviewed By: Sergey Differential Revision: http://developer.blender.org/D5288 --- source/blender/editors/space_clip/clip_ops.c | 5 +++++ source/blender/makesrna/intern/rna_space.c | 7 +++++++ 2 files changed, 12 insertions(+) (limited to 'source/blender') diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 83d8133a99e..45479c4253d 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1515,6 +1515,11 @@ static int mode_set_exec(bContext *C, wmOperator *op) sc->mode = mode; + if (sc->mode == SC_MODE_MASKEDIT && sc->view != SC_VIEW_CLIP) { + /* Make sure we are in the right view for mask editing */ + sc->view = SC_VIEW_CLIP; + } + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_CLIP, NULL); return OPERATOR_FINISHED; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 2ba5e2ae68c..6dc0cf045cd 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2105,6 +2105,13 @@ static void rna_SpaceClipEditor_clip_mode_update(Main *UNUSED(bmain), { SpaceClip *sc = (SpaceClip *)(ptr->data); + if (sc->mode == SC_MODE_MASKEDIT && sc->view != SC_VIEW_CLIP) { + /* Make sure we are in the right view for mask editing */ + sc->view = SC_VIEW_CLIP; + ScrArea *sa = rna_area_from_space(ptr); + ED_area_tag_refresh(sa); + } + sc->scopes.ok = 0; } -- cgit v1.2.3