[Bf-blender-cvs] [21fc36f] HMD_viewport: Bring back version patch

Julian Eisel noreply at git.blender.org
Sun Apr 10 20:12:36 CEST 2016


Commit: 21fc36fbc8f754e6957f2e322c4cb0c9641ac4e7
Author: Julian Eisel
Date:   Sun Apr 10 20:10:24 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB21fc36fbc8f754e6957f2e322c4cb0c9641ac4e7

Bring back version patch

Without it building with WITH_OPENHMD disabled will activate an invalid UserPref HMD device item.

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

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/editors/interface/resources.c

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

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index fdb3474..3eb1c30 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         277
-#define BLENDER_SUBVERSION      0
+#define BLENDER_SUBVERSION      1
 /* Several breakages with 270, e.g. constraint deg vs rad */
 #define BLENDER_MINVERSION      270
 #define BLENDER_MINSUBVERSION   6
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index b1d2e32..4ad1446 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2704,6 +2704,10 @@ void init_userdef_do_versions(void)
 		}
 	}
 
+	if (!USER_VERSION_ATLEAST(277, 1)) {
+		U.hmd_device = -1;
+	}
+
 	/**
 	 * Include next version bump.
 	 *




More information about the Bf-blender-cvs mailing list