blender
/
blender
136
408
Fork 592
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

WIP: UI: Node Dashed Lines Readability #110124

Closed
Harley Acheson wants to merge 1 commits from Harley/blender:NodeDashedLines into main
pull from: Harley/blender:NodeDashedLines
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 10 Commits 1 Files Changed 4 +5 -4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -853,7 +853,7 @@ const bTheme U_theme_default = {
.facedot_size = 4,
.noodle_curving = 4,
.grid_levels = 3,
.dash_alpha = 0.5f,
.dash_alpha = 0.0f,
.syntaxl = RGBA(0x303030ff),
.syntaxs = RGBA(0x973c3cff),
.syntaxb = RGBA(0xcccc00ff),

1
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -117,6 +117,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
{
/* Keep this block, even when empty. */
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_repeat);
btheme->space_node.dash_alpha = 0.0f;
}
#undef FROM_DEFAULT_V4_UCHAR

4
source/blender/editors/space_node/drawnode.cc
View File

@ -2084,11 +2084,11 @@ static NodeLinkDrawConfig nodelink_get_draw_config(const bContext &C,
const bool field_link = node_link_is_field_link(snode, link);
draw_config.dash_factor = field_link ? 0.75f : 1.0f;
draw_config.dash_factor = field_link ? 0.5f : 1.0f;
const float scale = UI_view2d_scale_get_x(&v2d);
/* Clamp the thickness to make the links more readable when zooming out. */
draw_config.thickness = max_ff(scale, 1.0f) * (field_link ? 0.7f : 1.0f);
draw_config.thickness = max_ff(scale, 1.0f) * (field_link ? 1.4f : 1.0f);
draw_config.highlighted = link.flag & NODE_LINK_TEMP_HIGHLIGHT;
draw_config.drawarrow = ((link.tonode && (link.tonode->type == NODE_REROUTE)) &&
(link.fromnode && (link.fromnode->type == NODE_REROUTE)));

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

@ -2988,7 +2988,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
prop = RNA_def_property(srna, "dash_alpha", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_float_default(prop, 0.0f);
RNA_def_property_ui_text(prop, "Dashed Lines Opacity", "Opacity for the dashed lines in wires");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");