blender
/
blender
134
425
Fork 607
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

UI: Improve Mesh Edge Highlighting #111431

Manually merged
Campbell Barton merged 12 commits from Gilberto.R/blender:temp-edgehighlight into main 2023-11-02 12:10:12 +01:00
Conversation 86 Commits 12 Files Changed 21 +19 -19
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 60d78771ac - Show all commits

10
release/datafiles/userdef/userdef_default_theme.c
View File

@ -317,7 +317,7 @@ const bTheme U_theme_default = {
.vertex_select = RGBA(0xff7a00ff),
.vertex_bevel = RGBA(0x00a5ffff),
.edge = RGBA(0x000000ff),
.edge_selection = RGBA(0xff9900ff),
.edge_select = RGBA(0xff9900ff),
Gilberto.R marked this conversation as resolved Outdated
Campbell Barton commented 2023-10-10 11:29:39 +02:00
Outdated
Review
Copy Link

Please don't rename these struct members, there doesn't seem any benefit in doing this and adds noise to the diff.

Please don't rename these struct members, there doesn't seem any benefit in doing this and adds noise to the diff.
Campbell Barton commented 2023-10-12 23:46:43 +02:00
Outdated
Review
Copy Link

Other renames remaining, TH_FACE_SELECTION... colorEdgeSelect

Other renames remaining, `TH_FACE_SELECTION`... colorEdgeSelect
.edge_mode_selection = RGBA(0xffd800ff),
.edge_seam = RGBA(0xdb2512ff),
.edge_sharp = RGBA(0x00ffffff),
@ -325,7 +325,7 @@ const bTheme U_theme_default = {
.edge_crease = RGBA(0xcc0099ff),
.edge_bevel = RGBA(0x00a5ffff),
.face = RGBA(0xffffff02),
.face_selection = RGBA(0xffa30033),
.face_select = RGBA(0xffa30033),
.face_mode_selection = RGBA(0xffb70033),
Gilberto.R marked this conversation as resolved Outdated
Campbell Barton commented 2023-10-18 06:19:23 +02:00
Outdated
Review
Copy Link

Please use term select, matching other names, e.g. ( face_mode_select), same with other uses in this patch.

Please use term `select`, matching other names, e.g. ( `face_mode_select`), same with other uses in this patch.
.face_retopology = RGBA(0x50c8ff0f),
.face_back = RGBA(0xff0000b3),
@ -706,9 +706,9 @@ const bTheme U_theme_default = {
.grid = RGBA(0x303030ff),
.wire_edit = RGBA(0xc0c0c0ff),
.vertex_select = RGBA(0xff8500ff),
.edge_selection = RGBA(0xff8500ff),
.edge_select = RGBA(0xff8500ff),
.face = RGBA(0xffffff0a),
.face_selection = RGBA(0xff85003c),
.face_select = RGBA(0xff85003c),
.face_dot = RGBA(0xff8500ff),
.cframe = RGBA(0x4772b3ff),
.freestyle_face_mark = RGBA(0x7fff7f33),
@ -842,7 +842,7 @@ const bTheme U_theme_default = {
.wire = RGBA(0x1a1a1aff),
.select = RGBA(0xed5700ff),
.active = RGBA(0xffffffff),
.edge_selection = RGBA(0xffffffb3),
.edge_select = RGBA(0xffffffb3),
.console_output = RGBA(0x000000ff),
.vertex_size = 3,
.outline_width = 1,

8
scripts/presets/interface_theme/Blender_Light.xml
View File

@ -373,7 +373,7 @@
vertex_size="3"
vertex_bevel="#00a5ff"
vertex_unreferenced="#000000"
edge_selection="#ff9900"
edge_select="#ff9900"
edge_mode_selection="#ffd800"
edge_seam="#db2512"
edge_sharp="#00ffff"
@ -382,7 +382,7 @@
edge_facesel="#4b4b4b"
freestyle_edge_mark="#7fff7f"
face="#00000012"
face_selection="#ffa30033"
face_select="#ffa30033"
face_mode_selection="#ffb70033"
face_dot="#ff8500"
facedot_size="4"
@ -740,7 +740,7 @@
vertex_bevel="#000000"
vertex_unreferenced="#000000"
face="#ffffff0a"
face_selection="#ff85003c"
face_select="#ff85003c"
face_dot="#ff8500"
facedot_size="3"
freestyle_face_mark="#7fff7f33"
@ -750,7 +750,7 @@
editmesh_active="#ffffff40"
wire_edit="#c0c0c0"
edge_width="1"
edge_selection="#ff8500"
edge_select="#ff8500"
scope_back="#727272ff"
preview_stitch_face="#7f7f0033"
preview_stitch_edge="#ff00ff33"

4
source/blender/blenloader/intern/versioning_userdef.cc
View File

@ -118,9 +118,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
}
if (!USER_VERSION_ATLEAST(400, 27)) {
FROM_DEFAULT_V4_UCHAR(space_view3d.edge_selection);
FROM_DEFAULT_V4_UCHAR(space_view3d.edge_select);
FROM_DEFAULT_V4_UCHAR(space_view3d.edge_mode_selection);
FROM_DEFAULT_V4_UCHAR(space_view3d.face_selection);
FROM_DEFAULT_V4_UCHAR(space_view3d.face_select);
FROM_DEFAULT_V4_UCHAR(space_view3d.face_mode_selection);
}

4
source/blender/editors/interface/resources.cc
View File

@ -389,7 +389,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = &ts->edge_width;
break;
case TH_EDGE_SELECTION:
cp = ts->edge_selection;
cp = ts->edge_select;
break;
case TH_EDGE_MODE_SELECTION:
cp = ts->edge_mode_selection;
@ -416,7 +416,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->face;
break;
case TH_FACE_SELECTION:
cp = ts->face_selection;
cp = ts->face_select;
break;
case TH_FACE_MODE_SELECTION:
cp = ts->face_mode_selection;

4
source/blender/makesdna/DNA_userdef_types.h
View File

@ -286,10 +286,10 @@ typedef struct ThemeSpace {
unsigned char active[4], group[4], group_active[4], transform[4];
unsigned char vertex[4], vertex_select[4], vertex_active[4], vertex_bevel[4],
vertex_unreferenced[4];
unsigned char edge[4], edge_selection[4], edge_mode_selection[4];
unsigned char edge[4], edge_select[4], edge_mode_selection[4];
Gilberto.R marked this conversation as resolved Outdated
Campbell Barton commented 2023-09-27 12:52:58 +02:00
Outdated
Review
Copy Link

Renaming looses the theme color from existing preferences, prefer keeping edge_select, edge_mode_select... etc.

Renaming looses the theme color from existing preferences, prefer keeping `edge_select`, `edge_mode_select`... etc.
👍 1
unsigned char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4], edge_bevel[4];
/** Solid faces. */
unsigned char face[4], face_selection[4], face_mode_selection[4], face_retopology[4], face_back[4], face_front[4];
unsigned char face[4], face_select[4], face_mode_selection[4], face_retopology[4], face_back[4], face_front[4];
/** Selected color. */
unsigned char face_dot[4];
unsigned char extra_edge_len[4], extra_edge_angle[4], extra_face_angle[4], extra_face_area[4];

8
source/blender/makesrna/intern/rna_userdef.cc
View File

@ -2122,7 +2122,7 @@ static void rna_def_userdef_theme_spaces_edge(StructRNA *srna)
{
PropertyRNA *prop;
prop = RNA_def_property(srna, "edge_selection", PROP_FLOAT, PROP_COLOR_GAMMA);
prop = RNA_def_property(srna, "edge_select", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Edge Selection", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
@ -2173,7 +2173,7 @@ static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
RNA_def_property_ui_text(prop, "Face", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "face_selection", PROP_FLOAT, PROP_COLOR_GAMMA);
prop = RNA_def_property(srna, "face_select", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Face Selection", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
@ -3061,7 +3061,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "wire_select", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "edge_selection");
RNA_def_property_float_sdna(prop, nullptr, "edge_select");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Wire Select", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
@ -3283,7 +3283,7 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Edge Width", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "edge_selection", PROP_FLOAT, PROP_COLOR_GAMMA);
prop = RNA_def_property(srna, "edge_select", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Edge Select", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");