diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:36:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:36:24 +0300 |
| commit | 031416c5590828e68090b9e6a10d96a70d537421 (patch) | |
| tree | 8f8a3bee5e9b1c5d859024e889dec23db65cb42f /source/blender/editors/screen | |
| parent | e8dd4cd9cabb76f00838a975627c571a4fccdb18 (diff) | |
| parent | b00d84035989d3cef3417ee4f2ca8475c6c2b57a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index d2301fa74d4..6f2c443f16b 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1455,7 +1455,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) } for (ar = sa->regionbase.first; ar; ar = ar->next) - ar->type = BKE_regiontype_from_id(sa->type, ar->regiontype); + ar->type = BKE_regiontype_from_id_or_first(sa->type, ar->regiontype); /* area sizes */ area_calc_totrct(sa, &window_rect); |