From 8bcb714b9eeba0216475571b7fc260cf37b5757e Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 20 Nov 2024 21:39:40 +0100 Subject: [PATCH] UI: Face Orientation Front Color Transparent This PR changes the default theme color for TH_FACE_FRONT, used by the Face Orientation overlay, to have zero alpha. That way, by default, it can be used always and not interfere with the display of (normal) front faces. Pull Request: https://projects.blender.org/blender/blender/pulls/130618 --- release/datafiles/userdef/userdef_default_theme.c | 2 +- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index d5c168be6f3..83f83b53e37 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -332,7 +332,7 @@ const bTheme U_theme_default = { .face_mode_select = RGBA(0xffb70033), .face_retopology = RGBA(0x50c8ff0f), .face_back = RGBA(0xff0000b3), - .face_front = RGBA(0x0000ffb3), + .face_front = RGBA(0x0000ff00), .face_dot = RGBA(0xff8a00ff), .extra_edge_len = RGBA(0x150806ff), .extra_edge_angle = RGBA(0x4d4d00ff), diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index ab8116cbada..78c44d00c52 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -31,7 +31,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 6 +#define BLENDER_FILE_SUBVERSION 7 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and cancel loading the file, showing a warning to diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index e074fbd646d..a3a2f7354a9 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -204,6 +204,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(tui.editor_outline_active); } + if (!USER_VERSION_ATLEAST(404, 7)) { + FROM_DEFAULT_V4_UCHAR(space_view3d.face_front); + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a USER_VERSION_ATLEAST check.