Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jun 2018 15:36:24 +0000 (17:36 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jun 2018 15:36:24 +0000 (17:36 +0200)
1  2 
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/editors/screen/area.c
source/blender/python/intern/bpy_rna_callback.c

@@@ -1455,10 -1452,13 +1455,10 @@@ void ED_area_initialize(wmWindowManage
        }
  
        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, WM_window_pixels_x(win), WM_window_pixels_y(win));
 -
 -      /* clear all azones, add the area triange widgets */
 -      area_azone_initialize(win, win->screen, sa);
 +      area_calc_totrct(sa, &window_rect);
  
        /* region rect sizes */
        rect = sa->totrct;