Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Jun 2018 15:56:18 +0000 (17:56 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Jun 2018 15:56:18 +0000 (17:56 +0200)
Conflicts:
source/blender/windowmanager/intern/wm_files.c

1  2 
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';