From 61116ee9364903d481f0f5f972b13ad54977b242 Mon Sep 17 00:00:00 2001 From: bonj Date: Tue, 7 Mar 2023 18:22:37 +0100 Subject: [PATCH 1/3] Add face_retopology to do_versions_theme This is something we missed in #104599. Without it, the default color isn't always set. Thanks to user roman-13 for pointing out the problem, and thanks to Hans Goudey for telling me the solution. --- source/blender/blenloader/intern/versioning_userdef.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 4b2acfa7205..8f624bc5497 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -99,6 +99,8 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) * \note Keep this message at the bottom of the function. */ { + FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); + /* Keep this block, even when empty. */ } -- 2.30.2 From b85c1d9d7a8c70336272a3e3476af4f34d944932 Mon Sep 17 00:00:00 2001 From: bonj Date: Thu, 9 Mar 2023 00:19:32 +0100 Subject: [PATCH 2/3] Move default retopology color into version block We don't want it to reset the color every time, just if the preferences file is older than the version that added the color. --- source/blender/blenloader/intern/versioning_userdef.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 8f624bc5497..d6450b191bf 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -89,6 +89,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item; } + if (!USER_VERSION_ATLEAST(306, 0)) { + FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); + } + /** * Versioning code until next subversion bump goes here. * @@ -99,8 +103,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) * \note Keep this message at the bottom of the function. */ { - FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); - /* Keep this block, even when empty. */ } -- 2.30.2 From b3b930bbbf02e94b740149638ed05fa4d576a748 Mon Sep 17 00:00:00 2001 From: bonj Date: Thu, 9 Mar 2023 13:39:25 +0100 Subject: [PATCH 3/3] Bump subversion and adjust versioning accordingly Jeroen Bakker told me to bump the subversion. I moved all the "Versioning code until next subversion bump goes here." code into a version check block in versioning_300.cc, and adjusted my if block in versioning_userdef.c. --- .../blender/blenkernel/BKE_blender_version.h | 2 +- .../blenloader/intern/versioning_300.cc | 26 +++++++++++-------- .../blenloader/intern/versioning_userdef.c | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 6f33219c7f6..9aba12948ae 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -19,7 +19,7 @@ extern "C" { /* Blender major and minor version. */ #define BLENDER_VERSION 306 /* Blender patch version for bugfix releases. */ -#define BLENDER_VERSION_PATCH 0 +#define BLENDER_VERSION_PATCH 1 /** Blender release cycle stage: alpha/beta/rc/release. */ #define BLENDER_VERSION_CYCLE alpha diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index 45c5b40486d..9b827c86df8 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -4148,16 +4148,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - "versioning_userdef.c", #blo_do_versions_userdef - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - { + if (!MAIN_VERSION_ATLEAST(bmain, 306, 1)) { /* Z bias for retopology overlay. */ if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "retopology_offset")) { LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { @@ -4180,11 +4171,24 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain) SEQ_for_each_callback(&ed->seqbase, version_set_seq_single_frame_content, nullptr); } } - /* Keep this block, even when empty. */ + LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { if (ntree->type == NTREE_GEOMETRY) { version_geometry_nodes_extrude_smooth_propagation(*ntree); } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - "versioning_userdef.c", #blo_do_versions_userdef + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index d6450b191bf..a247a9bfe75 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -89,7 +89,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item; } - if (!USER_VERSION_ATLEAST(306, 0)) { + if (!USER_VERSION_ATLEAST(306, 1)) { FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); } -- 2.30.2