[Bf-blender-cvs] [599bf05c568] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Tue May 15 19:54:38 CEST 2018


Commit: 599bf05c5683e0314e4dfdf03b21246fe99f7056
Author: Campbell Barton
Date:   Tue May 15 19:53:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB599bf05c5683e0314e4dfdf03b21246fe99f7056

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index efb3d0e7461,1f85d764d45..721ea158d51
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -524,17 -516,7 +524,7 @@@ static void wm_file_read_post(bContext 
  	if (addons_loaded) {
  		wm_file_read_report(C);
  	}
 -	
 +
- 	if (!G.background) {
- 		/* in background mode this makes it hard to load
- 		 * a blend file and do anything since the screen
- 		 * won't be set to a valid value again */
- 		CTX_wm_window_set(C, NULL); /* exits queues */
- 
- 		/* Ensure tools are registered. */
- 		WM_toolsystem_init(C);
- 	}
- 
  	if (!G.background) {
  		if (wm->undo_stack == NULL) {
  			wm->undo_stack = BKE_undosys_stack_create();
@@@ -543,6 -525,14 +533,17 @@@
  			BKE_undosys_stack_clear(wm->undo_stack);
  		}
  		BKE_undosys_stack_init_from_main(wm->undo_stack, CTX_data_main(C));
+ 		BKE_undosys_stack_init_from_context(wm->undo_stack, C);
+ 	}
+ 
+ 	if (!G.background) {
+ 		/* in background mode this makes it hard to load
+ 		 * a blend file and do anything since the screen
+ 		 * won't be set to a valid value again */
+ 		CTX_wm_window_set(C, NULL); /* exits queues */
++
++		/* Ensure tools are registered. */
++		WM_toolsystem_init(C);
  	}
  }



More information about the Bf-blender-cvs mailing list