Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-11-25 11:27:16 +0300
committerJeroen Bakker <jeroen@blender.org>2020-11-25 11:27:16 +0300
commit787af651a7ee82a5ba48fbccd1a3e3b66ac74edb (patch)
tree0dc1e57f3230f79cfee847cd2736aca8fe4f4bd9
parent31bf8307afc0fb995afcf2233dc50c28b531778d (diff)
File version bump
-rw-r--r--source/blender/blenkernel/BKE_blender_version.h2
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c9
2 files changed, 7 insertions, 4 deletions
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