[Bf-blender-cvs] [b8601b64c7c] master: Correct Blender version after last commit

[Hans Goudey]

Commit: b8601b64c7cba366f97535d53470c539632c43c6
Author: Hans Goudey
Date:   Sat Jul 18 12:25:51 2020 -0400
Branches: master
https://developer.blender.org/rBb8601b64c7cba366f97535d53470c539632c43c6

Correct Blender version after last commit

c08d84748804 incremented the patch version instead of the file subversion
for versioning code when adding new options. This commit resets the patch
version and instead bumps the file subversion.

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

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenloader/intern/versioning_userdef.c

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 14fb1091045..556c1c961dc 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -34,13 +34,13 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 290
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 1
+#define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
 #define BLENDER_VERSION_CYCLE alpha
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 6
+#define BLENDER_FILE_SUBVERSION 7
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 9a3f4be6786..50e3b375166 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -753,7 +753,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
     userdef->transopts &= ~USER_DOTRANSLATE_DEPRECATED;
   }
 
-  if (!USER_VERSION_ATLEAST(290, 1)) {
+  if (!USER_VERSION_ATLEAST(290, 7)) {
     userdef->statusbar_flag = STATUSBAR_SHOW_VERSION;
   }