[Bf-blender-cvs] [7ff07ddd01a] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 7ff07ddd01af7923f32cfff087ec1f566cb4a0a8
Author: Bastien Montagne
Date:   Tue Jun 5 17:56:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7ff07ddd01af7923f32cfff087ec1f566cb4a0a8

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/windowmanager/intern/wm_files.c

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index b7e0b1cf5c4,ffc6a566ced..088aca05268
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -864,14 -847,16 +864,16 @@@ int wm_homefile_read
  	/* prevent buggy files that had G_FILE_RELATIVE_REMAP written out by mistake. Screws up autosaves otherwise
  	 * can remove this eventually, only in a 2.53 and older, now its not written */
  	G.fileflags &= ~G_FILE_RELATIVE_REMAP;
 -	
 +
- 	if (use_userdef) {	
+ 	bmain = CTX_data_main(C);
+ 
+ 	if (use_userdef) {
  		/* check userdef before open window, keymaps etc */
- 		wm_init_userdef(CTX_data_main(C), read_userdef_from_memory);
+ 		wm_init_userdef(bmain, read_userdef_from_memory);
  	}
  	
  	/* match the read WM with current WM */
- 	wm_window_match_do(C, &wmbase, &G.main->wm, &G.main->wm);
 -	wm_window_match_do(C, &wmbase); 
++	wm_window_match_do(C, &wmbase, &bmain->wm, &bmain->wm);
  	WM_check(C); /* opens window(s), checks keymaps */
  
  	bmain->name[0] = '\0';