[Bf-blender-cvs] [3d9fca0] HMD_viewport: Update/correct version patching

[Julian Eisel]

Commit: 3d9fca040b4652561d7acae59a2d7108af5b6734
Author: Julian Eisel
Date:   Tue Aug 2 00:42:19 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB3d9fca040b4652561d7acae59a2d7108af5b6734

Update/correct version patching

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

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/editors/interface/resources.c

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 618b36c..a4b7d5c 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         277
-#define BLENDER_SUBVERSION      1
+#define BLENDER_SUBVERSION      2
 /* Several breakages with 270, e.g. constraint deg vs rad */
 #define BLENDER_MINVERSION      270
 #define BLENDER_MINSUBVERSION   6
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 267ebf4..c612c78 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1252,10 +1252,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "char", "hmd_view_shade")) {
+	{
+		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "char", "hmd_view_shade")) {
 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
 				scene->r.hmd_view_shade = OB_MATERIAL;
 				scene->r.hmd_fx_flags |= GPU_FX_FLAG_LensDist;
 			}
 		}
+	}
 }
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index a43ba35..c422655 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2734,7 +2734,7 @@ void init_userdef_do_versions(void)
 		}
 	}
 
-	if (!USER_VERSION_ATLEAST(277, 1)) {
+	if (!USER_VERSION_ATLEAST(277, 2)) {
 		U.hmd_device = -1;
 	}