[Bf-blender-cvs] [0bbbeead7d] HMD_viewport: Fixed HMD branch for current master

[Joey Ferwerda]

Commit: 0bbbeead7d6c78846354da1ba6df8c5d2139ea4f
Author: Joey Ferwerda
Date:   Fri Feb 10 17:20:27 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB0bbbeead7d6c78846354da1ba6df8c5d2139ea4f

Fixed HMD branch for current master

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index ea5f8fabcc..36dff5a15a 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1528,6 +1528,16 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			br->fill_threshold /= sqrt_3;
 		}
 
+		{
+	#ifdef WITH_INPUT_HMD
+			if (!DNA_struct_elem_find(fd->filesdna, "wmWindowManager", "HMDViewInfo", "hmd_view")) {
+				for (wmWindowManager *wm = main->wm.first; wm; wm = wm->id.next) {
+					wm->hmd_view.view_shade = OB_MATERIAL;
+				}
+			}
+	#endif
+		}
+
 		/* Custom motion paths */
 		if (!DNA_struct_elem_find(fd->filesdna, "bMotionPath", "int", "line_thickness")) {
 			Object *ob;
@@ -1593,14 +1603,4 @@ void do_versions_after_linking_270(Main *main)
 			}
 		} FOREACH_NODETREE_END
 	}
-
-	{
-#ifdef WITH_INPUT_HMD
-		if (!DNA_struct_elem_find(fd->filesdna, "wmWindowManager", "HMDViewInfo", "hmd_view")) {
-			for (wmWindowManager *wm = main->wm.first; wm; wm = wm->id.next) {
-				wm->hmd_view.view_shade = OB_MATERIAL;
-			}
-		}
-#endif
-	}
 }
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index ce14b02c41..7a9fe99a3e 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -837,7 +837,7 @@ static void wm_method_draw_triple_hmd_view(wmWindow *win)
 		/* OpenHMD sends us matrices for one eye (half screen), but we draw viewport over
 		 * entire screen. Using glViewport compensates that and prevents streched view. */
 		glViewport(view * win_x_h, 0, win_x_h, win_y);
-		wm_triple_draw_textures(win, drawdata->triple, 1.0f);
+		wm_triple_draw_textures(win, drawdata->triple, 1.0f, false);
 	}
 }