[Bf-blender-cvs] [fc601d8eaa7] workspaces: Revert minor order change - wm_file_read_post

Campbell Barton noreply at git.blender.org
Mon May 1 22:52:27 CEST 2017


Commit: fc601d8eaa79a7139a6100bc8df8873d648bc6d9
Author: Campbell Barton
Date:   Tue May 2 06:57:18 2017 +1000
Branches: workspaces
https://developer.blender.org/rBfc601d8eaa79a7139a6100bc8df8873d648bc6d9

Revert minor order change - wm_file_read_post

This function is meant to be last and I couldn't redo any bugs after
re-ordering.

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

M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index fd7c263f975..b7821a24fa9 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -588,7 +588,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
 		/* match the read WM with current WM */
 		wm_window_match_do(C, &wmbase);
 		WM_check(C); /* opens window(s), checks keymaps */
-		wm_file_read_post(C, false); /* do before wm_init_usedef to ensure updated context */
 
 		if (retval == BKE_BLENDFILE_READ_OK_USERPREFS) {
 			/* in case a userdef is read from regular .blend */
@@ -601,6 +600,8 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
 			}
 		}
 
+		wm_file_read_post(C, false);
+
 		success = true;
 	}
 #if 0




More information about the Bf-blender-cvs mailing list