diff options
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 152cb28e11e..9e341c909be 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1729,7 +1729,7 @@ void ED_area_prevspace(bContext *C, ScrArea *sa) /* no change */ return; } - sa->flag &= ~AREA_FLAG_STACKED_FULLSCREEN; + sa->flag &= ~(AREA_FLAG_STACKED_FULLSCREEN | AREA_FLAG_TEMP_TYPE); ED_area_tag_redraw(sa); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 2754b78d74a..f777b42c5bd 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1527,7 +1527,8 @@ void ED_screen_restore_temp_type(bContext *C, ScrArea *sa) if (sa->flag & AREA_FLAG_TEMP_TYPE) { ED_area_prevspace(C, sa); - sa->flag &= ~AREA_FLAG_TEMP_TYPE; + /* Flag should be cleared now. */ + BLI_assert((sa->flag & AREA_FLAG_TEMP_TYPE) == 0); } if (sa->full) { |