[Bf-blender-cvs] [3318e7bd13] HMD_viewport: Fixed small oops with copy paste

Joey Ferwerda noreply at git.blender.org
Fri Feb 10 17:59:26 CET 2017


Commit: 3318e7bd13c24a5d870d86ce0782bafd012cffbf
Author: Joey Ferwerda
Date:   Fri Feb 10 17:28:50 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB3318e7bd13c24a5d870d86ce0782bafd012cffbf

Fixed small oops with copy paste

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 36dff5a15a..0bf72c3023 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1528,16 +1528,6 @@ 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;
@@ -1569,6 +1559,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
+	{
+#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
+	}
 	/* To be added to next subversion bump! */
 	{
 		/* Mask primitive adding code was not initializing correctly id_type of its points' parent. */




More information about the Bf-blender-cvs mailing list