griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: GPv3: Conversion of 'thickness adjustment' not clamping radius to 0

Browse Source 
Legacy GPv2 code seems to clamp the final computed radius to `0` (at
least in some cases, see e.g. line 3992 in
`gpencil_stroke_perimeter_ex`).

Add a clamping node to the generated geometry node used to mimmic the
legacy thickness adjustment in GPv3 converted data.

NOTE: There are still some artifacts in testfile used to investigate
this issue (`(Anim) 10 Picknick by Susanne Weise.blend`), that looks
like invalid radius handling on some curves ends... Clamping _may_ be
needed in other places maybe?

Pull Request: https://projects.blender.org/blender/blender/pulls/120840
This commit is contained in:
Bastien Montagne
2024-04-22 15:03:06 +02:00
committed by Falk David
parent cfaa91296f
commit fc08f7491e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
View File

@@ -1095,14 +1095,14 @@ static bNodeTree *offset_radius_node_tree_add(ConversionData &conversion_data, L
DATA_("Layer"), "", "NodeSocketString", NODE_INTERFACE_SOCKET_INPUT, nullptr);
bNode *group_output = nodeAddNode(nullptr, group, "NodeGroupOutput");
group_output->locx = 580;
group_output->locx = 800;
group_output->locy = 160;
bNode *group_input = nodeAddNode(nullptr, group, "NodeGroupInput");
group_input->locx = 0;
group_input->locy = 160;
bNode *set_curve_radius = nodeAddNode(nullptr, group, "GeometryNodeSetCurveRadius");
set_curve_radius->locx = 400;
set_curve_radius->locx = 600;
set_curve_radius->locy = 160;
bNode *named_layer_selection = nodeAddNode(
nullptr, group, "GeometryNodeInputNamedLayerSelection");
@@ -1117,6 +1117,12 @@ static bNodeTree *offset_radius_node_tree_add(ConversionData &conversion_data, L
add->locx = 200;
add->locy = 0;
bNode *clamp_radius = nodeAddNode(nullptr, group, "ShaderNodeClamp");
clamp_radius->locx = 400;
clamp_radius->locy = 0;
bNodeSocket *sock_max = nodeFindSocket(clamp_radius, SOCK_IN, "Max");
static_cast<bNodeSocketValueFloat *>(sock_max->default_value)->value = FLT_MAX;
nodeAddLink(group,
group_input,
nodeFindSocket(group_input, SOCK_OUT, "Socket_0"),
@@ -1152,6 +1158,11 @@ static bNodeTree *offset_radius_node_tree_add(ConversionData &conversion_data, L
nodeAddLink(group,
add,
nodeFindSocket(add, SOCK_OUT, "Value"),
clamp_radius,
nodeFindSocket(clamp_radius, SOCK_IN, "Value"));
nodeAddLink(group,
clamp_radius,
nodeFindSocket(clamp_radius, SOCK_OUT, "Result"),
set_curve_radius,
nodeFindSocket(set_curve_radius, SOCK_IN, "Radius"));