Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / screen / area.c
index d2301fa74d46c3886eab8be7e44429322fa36572..6f2c443f16be1bb4a0fc1c7c266289d850117b2d 100644 (file)
@@ -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);