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

Campbell Barton noreply at git.blender.org
Fri Mar 23 11:56:36 CET 2018


Commit: da00a50f7f48bfd95924705e69babea41f9d7b2b
Author: Campbell Barton
Date:   Fri Mar 23 11:56:14 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBda00a50f7f48bfd95924705e69babea41f9d7b2b

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/windowmanager/intern/wm_window.c
index a173281b7d0,408229e501c..4c3a89f76fa
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -468,29 -457,13 +495,14 @@@ void wm_window_close(bContext *C, wmWin
  			break;
  	}
  
- 	if (tmpwin == NULL)
- 		do_exit = 1;
- 
- 	if ((U.uiflag & USER_QUIT_PROMPT) && !wm->file_saved && !G.background && do_exit) {
- 		/* We have unsaved changes and we're quitting */
- 		if(GHOST_SupportsNativeDialogs() == 0) {
- 			wm_confirm_quit(C);
- 		}
- 		else {
- 			if (!GHOST_confirmQuit(win->ghostwin))
- 				return;
- 		}
- 	}
- 	else if (do_exit) {
- 		/* No changes but we're quitting */
- 		/* let WM_exit do all freeing, for correct quit.blend save */
- 		WM_exit(C);
+ 	if (tmpwin == NULL) {
+ 		wm_quit_with_optional_confirmation_prompt(C, win);
  	}
  	else {
 -		/* We're just closing a window */
 -		bScreen *screen = win->screen;
 -		
 +		bScreen *screen = WM_window_get_active_screen(win);
 +		WorkSpace *workspace = WM_window_get_active_workspace(win);
 +		WorkSpaceLayout *layout = BKE_workspace_active_layout_get(win->workspace_hook);
 +
  		BLI_remlink(&wm->windows, win);
  		
  		wm_draw_window_clear(win);
diff --cc source/blender/windowmanager/wm_window.h
index 75595eb8817,5209af87960..b0c7021c496
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@@ -81,14 -76,10 +81,14 @@@ void		wm_window_IME_end	(wmWindow *win)
  
  /* *************** window operators ************** */
  int			wm_window_close_exec(bContext *C, struct wmOperator *op);
 -int			wm_window_duplicate_exec(bContext *C, struct wmOperator *op);
  int			wm_window_fullscreen_toggle_exec(bContext *C, struct wmOperator *op);
- void		wm_confirm_quit(bContext *C);
+ void		wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win) ATTR_NONNULL();
  
 +const struct EnumPropertyItem *wm_window_new_screen_itemf(
 +        bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
 +int			wm_window_new_exec(bContext *C, struct wmOperator *op);
 +int			wm_window_new_invoke(bContext *C, struct wmOperator *op, const struct wmEvent *event);
 +
  /* Initial (unmaximized) size to start with for
   * systems that can't find it for themselves (X11).
   * Clamped by real desktop limits */



More information about the Bf-blender-cvs mailing list