From 41a9b28e1ff080fa9d11516ceedf43d3a062c8b6 Mon Sep 17 00:00:00 2001 From: "demeterdzadik@gmail.com" Date: Mon, 9 Oct 2023 19:21:12 +0200 Subject: [PATCH 1/6] New bone color presets See design task: https://projects.blender.org/blender/blender/issues/112635 --- .../datafiles/userdef/userdef_default_theme.c | 120 +++++++++--------- .../presets/interface_theme/Blender_Light.xml | 120 +++++++++--------- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 0edc3fcf40c..d8cc43d1332 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -1098,104 +1098,104 @@ const bTheme U_theme_default = { }, .tarm = { { - .solid = RGBA(0x9a0000ff), - .select = RGBA(0xbd1111ff), - .active = RGBA(0xf70a0aff), + .solid = RGBA(0xe06254ff), + .select = RGBA(0xff7f71ff), + .active = RGBA(0xffe9e6ff), }, { - .solid = RGBA(0xf74018ff), - .select = RGBA(0xf66913ff), - .active = RGBA(0xfa9900ff), + .solid = RGBA(0xd2a087ff), + .select = RGBA(0xeeb899ff), + .active = RGBA(0xffefe6ff), }, { - .solid = RGBA(0x1e9109ff), - .select = RGBA(0x59b70bff), - .active = RGBA(0x83ef1dff), + .solid = RGBA(0xd2944dff), + .select = RGBA(0xeda348ff), + .active = RGBA(0xfff4e6ff), }, { - .solid = RGBA(0x0a3694ff), - .select = RGBA(0x3667dfff), - .active = RGBA(0x5ec1efff), + .solid = RGBA(0xd5bb3aff), + .select = RGBA(0xd0b639ff), + .active = RGBA(0xfffbe6ff), }, { - .solid = RGBA(0xa9294eff), - .select = RGBA(0xc1416aff), - .active = RGBA(0xf05d91ff), + .solid = RGBA(0xb9b379ff), + .select = RGBA(0xbcb57bff), + .active = RGBA(0xfffce6ff), }, { - .solid = RGBA(0x430c78ff), - .select = RGBA(0x543aa3ff), - .active = RGBA(0x8764d5ff), + .solid = RGBA(0x9fbe39ff), + .select = RGBA(0xacc13aff), + .active = RGBA(0xfbffe6ff), }, { - .solid = RGBA(0x24785aff), - .select = RGBA(0x3c9579ff), - .active = RGBA(0x6fb6abff), + .solid = RGBA(0x7bc83bff), + .select = RGBA(0x85cc3cff), + .active = RGBA(0xf3ffe6ff), }, { - .solid = RGBA(0x4b707cff), - .select = RGBA(0x6a8691ff), - .active = RGBA(0x9bc2cdff), + .solid = RGBA(0xa2c491ff), + .select = RGBA(0xa1bc8bff), + .active = RGBA(0xf1ffe6ff), }, { - .solid = RGBA(0xf4c90cff), - .select = RGBA(0xeec236ff), - .active = RGBA(0xf3ff00ff), + .solid = RGBA(0x2ebe4aff), + .select = RGBA(0x37e14eff), + .active = RGBA(0xe6ffe9ff), }, { - .solid = RGBA(0x1e2024ff), - .select = RGBA(0x484c56ff), - .active = RGBA(0xffffffff), + .solid = RGBA(0x71c595ff), + .select = RGBA(0x77c88bff), + .active = RGBA(0xe6ffecff), }, { - .solid = RGBA(0x6f2f6aff), - .select = RGBA(0x9845beff), - .active = RGBA(0xd330d6ff), + .solid = RGBA(0x34d79cff), + .select = RGBA(0x35da9eff), + .active = RGBA(0xe6fff6ff), }, { - .solid = RGBA(0x6c8e22ff), - .select = RGBA(0x7fb022ff), - .active = RGBA(0xbbef5bff), + .solid = RGBA(0x3ad5d4ff), + .select = RGBA(0x3bd2d7ff), + .active = RGBA(0xe6feffff), }, { - .solid = RGBA(0x8d8d8dff), - .select = RGBA(0xb0b0b0ff), - .active = RGBA(0xdededeff), + .solid = RGBA(0x61b0ddff), + .select = RGBA(0x6bc1f3ff), + .active = RGBA(0xe6f6ffff), }, { - .solid = RGBA(0x834326ff), - .select = RGBA(0x8b5811ff), - .active = RGBA(0xbd6a11ff), + .solid = RGBA(0x9cc1e5ff), + .select = RGBA(0x83d0e1ff), + .active = RGBA(0xe6fbffff), }, { - .solid = RGBA(0x08310eff), - .select = RGBA(0x1c430bff), - .active = RGBA(0x34622bff), + .solid = RGBA(0x9d94ffff), + .select = RGBA(0xb2abffff), + .active = RGBA(0xe8e6ffff), }, { - .solid = RGBA(0x000000ff), - .select = RGBA(0x000000ff), - .active = RGBA(0x000000ff), + .solid = RGBA(0xcfb2f1ff), + .select = RGBA(0xc4a8e3ff), + .active = RGBA(0xf2e6ffff), }, { - .solid = RGBA(0x000000ff), - .select = RGBA(0x000000ff), - .active = RGBA(0x000000ff), + .solid = RGBA(0xce68f2ff), + .select = RGBA(0xe59cffff), + .active = RGBA(0xf8e6ffff), }, { - .solid = RGBA(0x000000ff), - .select = RGBA(0x000000ff), - .active = RGBA(0x000000ff), + .solid = RGBA(0xe74ad2ff), + .select = RGBA(0xff95f1ff), + .active = RGBA(0xffe6fcff), }, { - .solid = RGBA(0x000000ff), - .select = RGBA(0x000000ff), - .active = RGBA(0x000000ff), + .solid = RGBA(0xdaa1c9ff), + .select = RGBA(0xdda3ccff), + .active = RGBA(0xffe6f8ff), }, { - .solid = RGBA(0x000000ff), - .select = RGBA(0x000000ff), - .active = RGBA(0x000000ff), + .solid = RGBA(0xd85989ff), + .select = RGBA(0xff98d9ff), + .active = RGBA(0xffe6f6ff), }, }, .collection_color = { diff --git a/scripts/presets/interface_theme/Blender_Light.xml b/scripts/presets/interface_theme/Blender_Light.xml index b1381a2092d..ae0a6c348ea 100644 --- a/scripts/presets/interface_theme/Blender_Light.xml +++ b/scripts/presets/interface_theme/Blender_Light.xml @@ -1390,142 +1390,142 @@ -- 2.30.2 From c58714eb97138d2e9cdd4de7543765d2c4d2396e Mon Sep 17 00:00:00 2001 From: "demeterdzadik@gmail.com" Date: Mon, 9 Oct 2023 20:00:12 +0200 Subject: [PATCH 2/6] Add versioning --- source/blender/blenloader/intern/versioning_userdef.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 7e785184212..8d523941f0f 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -70,6 +70,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) memcpy(btheme, &U_theme_default, sizeof(*btheme)); } + printf("VERSION:"); + printf("%d", userdef->versionfile); + printf("%d", userdef->subversionfile); /* Again reset the theme, but only if stored with an early 3.1 alpha version. Some changes were * done in the release branch and then merged into the 3.1 branch (master). So the previous reset * wouldn't work for people who saved their preferences with a 3.1 build meanwhile. But we still @@ -111,6 +114,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.back); FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.header_back); } + if (!USER_VERSION_ATLEAST(400, 24)) { + memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm)*20); + } if (!USER_VERSION_ATLEAST(400, 24)) { FROM_DEFAULT_V4_UCHAR(tui.wcol_list_item.inner_sel); -- 2.30.2 From ca303f0cc221da3b4441e80a77e0e6403eac65ff Mon Sep 17 00:00:00 2001 From: "demeterdzadik@gmail.com" Date: Mon, 9 Oct 2023 20:01:29 +0200 Subject: [PATCH 3/6] remove prints --- source/blender/blenloader/intern/versioning_userdef.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 8d523941f0f..8d130d1db8a 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -70,9 +70,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) memcpy(btheme, &U_theme_default, sizeof(*btheme)); } - printf("VERSION:"); - printf("%d", userdef->versionfile); - printf("%d", userdef->subversionfile); /* Again reset the theme, but only if stored with an early 3.1 alpha version. Some changes were * done in the release branch and then merged into the 3.1 branch (master). So the previous reset * wouldn't work for people who saved their preferences with a 3.1 build meanwhile. But we still -- 2.30.2 From 1be23bda774126fcda62daddd208b02e35357a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 10 Oct 2023 10:39:20 +0200 Subject: [PATCH 4/6] Move versioning into the 'this always runs' block until we land the PR --- source/blender/blenloader/intern/versioning_userdef.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 8d130d1db8a..08a80785a79 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -111,9 +111,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.back); FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.header_back); } - if (!USER_VERSION_ATLEAST(400, 24)) { - memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm)*20); - } if (!USER_VERSION_ATLEAST(400, 24)) { FROM_DEFAULT_V4_UCHAR(tui.wcol_list_item.inner_sel); @@ -143,6 +140,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ + memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm) * 20); } #undef FROM_DEFAULT_V4_UCHAR -- 2.30.2 From 45d1c0c72d967a19893dca0a1fc85a0032028529 Mon Sep 17 00:00:00 2001 From: "demeterdzadik@gmail.com" Date: Tue, 10 Oct 2023 16:23:05 +0200 Subject: [PATCH 5/6] Partial versioning code, very much WIP Just committing to transfer to another computer. --- .../blenloader/intern/versioning_400.cc | 24 +++++++++++++++++++ .../blenloader/intern/versioning_userdef.cc | 8 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index bb71ebdde48..ec6757c247d 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -1049,6 +1049,30 @@ static void enable_geometry_nodes_is_modifier(Main &bmain) } } +static void version_bone_color_theme(Main &bmain) +{ + auto version_bone_color = [&](animrig::BoneColor &color) { + // do stuff. + }; + + /* Version pose bone colors. */ + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + if (ob->type != OB_ARMATURE || !ob->pose) { + continue; + } + + LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { + version_bone_color(pchan->color); + } + } + + /* Version armature bone colors. */ + LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) { + blender::animrig::ANIM_armature_foreach_bone( + &arm->bonebase, [&](Bone *bone) { version_bone_color(bone->color); }); + } +} + void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain) { if (!MAIN_VERSION_FILE_ATLEAST(bmain, 400, 1)) { diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 08a80785a79..84e92fbf675 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -60,6 +60,12 @@ /* For versioning we only ever want to manipulate preferences passed in. */ #define U BLI_STATIC_ASSERT(false, "Global 'U' not allowed, only use arguments passed in!") +static void version_bone_color_theme(bTheme *btheme) +{ + /* Reset the bone colors to the new default values. */ + memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm) * 20); +} + static void do_versions_theme(const UserDef *userdef, bTheme *btheme) { @@ -140,7 +146,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ - memcpy(btheme->tarm, &U_theme_default.tarm, sizeof(*btheme->tarm) * 20); + version_bone_color_theme(btheme); } #undef FROM_DEFAULT_V4_UCHAR -- 2.30.2 From a5195e68ed4010d3cca4385e71979c6561a6d620 Mon Sep 17 00:00:00 2001 From: "demeterdzadik@gmail.com" Date: Tue, 10 Oct 2023 16:26:40 +0200 Subject: [PATCH 6/6] New Colors v4 --- .../datafiles/userdef/userdef_default_theme.c | 88 ++++++++--------- .../presets/interface_theme/Blender_Light.xml | 99 +++++++++---------- 2 files changed, 93 insertions(+), 94 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index d8cc43d1332..c86472b1782 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -1099,103 +1099,103 @@ const bTheme U_theme_default = { .tarm = { { .solid = RGBA(0xe06254ff), - .select = RGBA(0xff7f71ff), - .active = RGBA(0xffe9e6ff), + .select = RGBA(0xff7566ff), + .active = RGBA(0xffe8e6ff), }, { - .solid = RGBA(0xd2a087ff), - .select = RGBA(0xeeb899ff), - .active = RGBA(0xffefe6ff), + .solid = RGBA(0xd2b1a1ff), + .select = RGBA(0xfea275ff), + .active = RGBA(0xffeee6ff), }, { - .solid = RGBA(0xd2944dff), - .select = RGBA(0xeda348ff), - .active = RGBA(0xfff4e6ff), + .solid = RGBA(0xd2743fff), + .select = RGBA(0xffbb6eff), + .active = RGBA(0xfff3e6ff), }, { .solid = RGBA(0xd5bb3aff), - .select = RGBA(0xd0b639ff), + .select = RGBA(0xedd041ff), .active = RGBA(0xfffbe6ff), }, { .solid = RGBA(0xb9b379ff), - .select = RGBA(0xbcb57bff), - .active = RGBA(0xfffce6ff), + .select = RGBA(0xe5de96ff), + .active = RGBA(0xfffde6ff), }, { .solid = RGBA(0x9fbe39ff), - .select = RGBA(0xacc13aff), - .active = RGBA(0xfbffe6ff), + .select = RGBA(0xc5eb47ff), + .active = RGBA(0xf9ffe6ff), }, { .solid = RGBA(0x7bc83bff), - .select = RGBA(0x85cc3cff), - .active = RGBA(0xf3ffe6ff), - }, - { - .solid = RGBA(0xa2c491ff), - .select = RGBA(0xa1bc8bff), + .select = RGBA(0x91eb45ff), .active = RGBA(0xf1ffe6ff), }, { - .solid = RGBA(0x2ebe4aff), - .select = RGBA(0x37e14eff), - .active = RGBA(0xe6ffe9ff), + .solid = RGBA(0xa2c491ff), + .select = RGBA(0xc1e9acff), + .active = RGBA(0xefffe6ff), }, { - .solid = RGBA(0x71c595ff), - .select = RGBA(0x77c88bff), - .active = RGBA(0xe6ffecff), + .solid = RGBA(0x2ebe4aff), + .select = RGBA(0x3ce35bff), + .active = RGBA(0xe6ffebff), }, { .solid = RGBA(0x34d79cff), - .select = RGBA(0x35da9eff), + .select = RGBA(0x39efadff), .active = RGBA(0xe6fff6ff), }, { .solid = RGBA(0x3ad5d4ff), - .select = RGBA(0x3bd2d7ff), - .active = RGBA(0xe6feffff), + .select = RGBA(0x3fe7e6ff), + .active = RGBA(0xe6ffffff), }, { - .solid = RGBA(0x61b0ddff), - .select = RGBA(0x6bc1f3ff), - .active = RGBA(0xe6f6ffff), - }, - { - .solid = RGBA(0x9cc1e5ff), - .select = RGBA(0x83d0e1ff), - .active = RGBA(0xe6fbffff), + .solid = RGBA(0x88bbd7ff), + .select = RGBA(0x71b6f9ff), + .active = RGBA(0xe6f3ffff), }, { .solid = RGBA(0x9d94ffff), - .select = RGBA(0xb2abffff), + .select = RGBA(0x9990ffff), .active = RGBA(0xe8e6ffff), }, { .solid = RGBA(0xcfb2f1ff), - .select = RGBA(0xc4a8e3ff), + .select = RGBA(0xc28effff), .active = RGBA(0xf2e6ffff), }, { .solid = RGBA(0xce68f2ff), - .select = RGBA(0xe59cffff), - .active = RGBA(0xf8e6ffff), + .select = RGBA(0xde80ffff), + .active = RGBA(0xf9e6ffff), }, { .solid = RGBA(0xe74ad2ff), - .select = RGBA(0xff95f1ff), + .select = RGBA(0xff71edff), .active = RGBA(0xffe6fcff), }, { .solid = RGBA(0xdaa1c9ff), - .select = RGBA(0xdda3ccff), + .select = RGBA(0xfd8bdbff), .active = RGBA(0xffe6f8ff), }, { .solid = RGBA(0xd85989ff), - .select = RGBA(0xff98d9ff), - .active = RGBA(0xffe6f6ff), + .select = RGBA(0xff83b1ff), + .active = RGBA(0xffe6efff), + }, + { + .solid = RGBA(0xb4abaeff), + .select = RGBA(0xd6adb3ff), + .active = RGBA(0xffe6eaff), + }, + { + .solid = RGBA(0x464344ff), + .select = RGBA(0xb1b0b0ff), + .active = RGBA(0xffe6e6ff), }, }, .collection_color = { diff --git a/scripts/presets/interface_theme/Blender_Light.xml b/scripts/presets/interface_theme/Blender_Light.xml index ae0a6c348ea..84cff29d67f 100644 --- a/scripts/presets/interface_theme/Blender_Light.xml +++ b/scripts/presets/interface_theme/Blender_Light.xml @@ -1388,144 +1388,143 @@ - - - - - - + + + + -- 2.30.2