[Bf-blender-cvs] [93278801099] HMD_viewport: Merge branch 'master' into HMD_viewport

[Campbell Barton]

Commit: 93278801099d35a66c9f966f36ebb70fc66e1f0e
Author: Campbell Barton
Date:   Mon Apr 3 01:20:08 2017 +1000
Branches: HMD_viewport
https://developer.blender.org/rB93278801099d35a66c9f966f36ebb70fc66e1f0e

Merge branch 'master' into HMD_viewport

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



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

diff --cc source/blender/windowmanager/intern/wm_window.c
index 0641d2131fd,aaf77946412..332f71665ce
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -309,10 -309,10 +309,10 @@@ void wm_window_close(bContext *C, wmWin
  			break;
  	}
  
 -	if (tmpwin == NULL)
 +	if (normal_win == NULL)
  		do_exit = 1;
  	
- 	if ((U.uiflag & USER_QUIT_PROMPT) && !wm->file_saved) {
+ 	if ((U.uiflag & USER_QUIT_PROMPT) && !wm->file_saved && !G.background) {
  		if (do_exit) {
  			if (!GHOST_confirmQuit(win->ghostwin))
  				return;