[Bf-blender-cvs] [8e4b4881c87] HMD_viewport: Fix Multi-view drawing interfering with HMD view drawing

[Julian Eisel]

Commit: 8e4b4881c871fdf9d7796f4fa1b887f268f36803
Author: Julian Eisel
Date:   Tue Apr 11 23:19:11 2017 +0200
Branches: HMD_viewport
https://developer.blender.org/rB8e4b4881c871fdf9d7796f4fa1b887f268f36803

Fix Multi-view drawing interfering with HMD view drawing

Don't do any multi-view drawing in HMD view, it doesn't make any sense.

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index dbdd7d03846..b2a82a702da 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -845,11 +845,8 @@ static void wm_method_draw_triple_all(bContext *C, wmWindow *win)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
 	const bool is_stereo3d_enabled = WM_stereo3d_enabled(win, false);
-	const bool is_hmd_view =
 #ifdef WITH_INPUT_HMD
-	        wm->hmd_view.hmd_win == win && win->screen->is_hmd_running;
-#else
-	        false;
+	const bool is_hmd_view = WM_window_is_hmd_view(wm, win);
 #endif
 	const bool draw_multiview_lr = is_stereo3d_enabled || is_hmd_view;
 
@@ -859,19 +856,20 @@ static void wm_method_draw_triple_all(bContext *C, wmWindow *win)
 		wm_method_draw_triple_multiview(C, win, STEREO_RIGHT_ID);
 	}
 
-	if (is_stereo3d_enabled) {
-		wm_method_draw_stereo3d(win);
-	}
-	else if (is_hmd_view) {
 #ifdef WITH_INPUT_HMD
+	if (is_hmd_view) {
 		wm_method_draw_triple_hmd_view(win);
-#else
-		UNUSED_VARS(wm);
+	}
+	else
 #endif
+	if (is_stereo3d_enabled) {
+		wm_method_draw_stereo3d(win);
 	}
 	else {
 		wm_method_draw_triple(C, win);
 	}
+
+	UNUSED_VARS(wm);
 }
 
 /****************** main update call **********************/