[Bf-blender-cvs] [ab5a1ebe3ae] blender-v2.80-release: Fix missing subversion bump for 2.80 release.

[Bastien Montagne]

Commit: ab5a1ebe3aefa457860868e14e297a76eaca749a
Author: Bastien Montagne
Date:   Mon Jul 22 18:44:22 2019 +0200
Branches: blender-v2.80-release
https://developer.blender.org/rBab5a1ebe3aefa457860868e14e297a76eaca749a

Fix missing subversion bump for 2.80 release.

We need a final subversion bump before release in case there are
remaining 'unversioned' code in our versionning callbacks...

Should have been done before first RC actually. ;)

To be ported to 2.80 release branch.

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

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

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 3c89644952e..449eaacd8ad 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -27,7 +27,7 @@
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
 #define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 74
+#define BLENDER_SUBVERSION 75
 /** Several breakages with 280, e.g. collections vs layers. */
 #define BLENDER_MINVERSION 280
 #define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index ce06364a9f0..cb2b64957f0 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3495,9 +3495,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
     }
   }
 
-  {
-    /* Versioning code until next subversion bump goes here. */
-
+  if (!MAIN_VERSION_ATLEAST(bmain, 280, 75)) {
     for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
       if (scene->master_collection != NULL) {
         scene->master_collection->flag &= ~(COLLECTION_RESTRICT_VIEWPORT |
@@ -3534,4 +3532,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
       arm->flag &= ~(ARM_FLAG_UNUSED_6);
     }
   }
+
+  {
+    /* Versioning code until next subversion bump goes here. */
+  }
 }