[Bf-blender-cvs] [787af651a7e] blender-v2.91-release: File version bump
Jeroen Bakker
noreply at git.blender.org
Wed Nov 25 09:42:41 CET 2020
Commit: 787af651a7ee82a5ba48fbccd1a3e3b66ac74edb
Author: Jeroen Bakker
Date: Wed Nov 25 09:27:16 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB787af651a7ee82a5ba48fbccd1a3e3b66ac74edb
File version bump
===================================================================
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 741abb50453..cc7270c8ee0 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 9
+#define BLENDER_FILE_SUBVERSION 10
/* 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 f76fac23e96..bdcab6ecbb3 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -246,6 +246,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_graph.vertex_active);
}
+ if (!USER_VERSION_ATLEAST(291, 10)) {
+ for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
+ FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
+ }
+ }
+
/**
* Versioning code until next subversion bump goes here.
*
@@ -257,9 +263,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
- for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
- FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
- }
}
#undef FROM_DEFAULT_V4_UCHAR
More information about the Bf-blender-cvs
mailing list