[Bf-blender-cvs] [ccf97e10137] master: Version bump to 2.90.1 for versioning code

Antonio Vazquez noreply at git.blender.org
Mon May 11 16:34:27 CEST 2020


Commit: ccf97e10137e5f0fcff79f3a62b77ff92edf820c
Author: Antonio Vazquez
Date:   Mon May 11 16:22:24 2020 +0200
Branches: master
https://developer.blender.org/rBccf97e10137e5f0fcff79f3a62b77ff92edf820c

Version bump to 2.90.1 for versioning code

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

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 4b917beee17..852549f22d4 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -31,7 +31,7 @@ extern "C" {
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
 #define BLENDER_VERSION 290
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
 /** 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 2e81372aab6..7602b05ca76 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1750,7 +1750,7 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports))
     }
   }
 
-  if (!MAIN_VERSION_ATLEAST(bmain, 290, 0)) {
+  if (!MAIN_VERSION_ATLEAST(bmain, 290, 1)) {
     /* Patch old grease pencil modifiers material filter. */
     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
       LISTBASE_FOREACH (GpencilModifierData *, md, &ob->greasepencil_modifiers) {



More information about the Bf-blender-cvs mailing list