diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
| commit | 40412499433ef6d8619fd1e8ecaa00addb163721 (patch) | |
| tree | 17f9e5f936237cb4714f5ef0361f09dd0435db92 /source/blender/editors/screen/screen_edit.c | |
| parent | ba4d07cc5c74e42445a59bf1e77587cbf4a83482 (diff) | |
| parent | 0a28bb14222c7753a987256a9c155b670137ee37 (diff) | |
Merge branch 'blender2.7'
Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 502e5a92241..8c38ba41821 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1083,7 +1083,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) { |