[Bf-blender-cvs] [031416c5590] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 031416c5590828e68090b9e6a10d96a70d537421
Author: Campbell Barton
Date:   Tue Jun 12 17:36:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB031416c5590828e68090b9e6a10d96a70d537421

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/screen/area.c
index d2301fa74d4,6e4cbf27e28..6f2c443f16b
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.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;