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

Fix #133194: Grease Pencil Vertex Weight Angle influence vertexgroup has no effect

Browse Source 
The weights were just not used at all.

Stumbled over this checking on #133055

Pull Request: https://projects.blender.org/blender/blender/pulls/133195
This commit is contained in:
Philipp Oeser
2025-01-17 13:39:26 +01:00
committed by Falk David
parent e3d83806fd
commit 782a4c9d85
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
View File

@@ -135,7 +135,7 @@ static void write_weights_for_drawing(const ModifierData &md,
BLI_assert(!dst_weights.span.is_empty()); BLI_assert(!dst_weights.span.is_empty());
const VArray<float> input_weights = modifier::greasepencil::get_influence_vertex_weights( const VArray<float> influence_weights = modifier::greasepencil::get_influence_vertex_weights(
curves, mmd.influence); curves, mmd.influence);
/* Use default Z up. */ /* Use default Z up. */
@@ -164,6 +164,11 @@ static void write_weights_for_drawing(const ModifierData &md,
return; return;
} }
for (const int point : points.drop_front(1)) { for (const int point : points.drop_front(1)) {
const float influence_weight = influence_weights[point];
if (influence_weight <= 0.0f) {
continue;
}
const float3 p1 = math::transform_point(obmat3x3, positions[point]); const float3 p1 = math::transform_point(obmat3x3, positions[point]);
const float3 p2 = math::transform_point(obmat3x3, positions[point - 1]); const float3 p2 = math::transform_point(obmat3x3, positions[point - 1]);
const float3 vec = p2 - p1; const float3 vec = p2 - p1;
@@ -177,6 +182,7 @@ static void write_weights_for_drawing(const ModifierData &md,
dst_weights.span[point] = (mmd.flag & MOD_GREASE_PENCIL_WEIGHT_ANGLE_MULTIPLY_DATA) ? dst_weights.span[point] = (mmd.flag & MOD_GREASE_PENCIL_WEIGHT_ANGLE_MULTIPLY_DATA) ?
dst_weights.span[point] * weight : dst_weights.span[point] * weight :
weight; weight;
dst_weights.span[point] *= influence_weight;
dst_weights.span[point] = math::clamp(dst_weights.span[point], mmd.min_weight, 1.0f); dst_weights.span[point] = math::clamp(dst_weights.span[point], mmd.min_weight, 1.0f);
} }
/* First point has the same weight as the second one. */ /* First point has the same weight as the second one. */