blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

GPv3: Opacity modifier #116946

Merged
Lukas Tönne merged 52 commits from LukasTonne/blender:gp3-opacity-modifier into main 2024-01-16 16:56:22 +01:00
Conversation 8 Commits 52 Files Changed 11 +7 -9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc1961e798 - Show all commits

16
source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
View File

@ -99,11 +99,11 @@ static void modify_stroke_color(const GreasePencilOpacityModifierData &omd,
for (const int64_t i : curves_mask.index_range()) {
const int64_t curve_i = curves_mask[i];
const IndexRange points_range = points_by_curve[curve_i];
for (const int64_t point_i : points_range) {
const float curve_input = points_range.size() >= 2 ? (float(point_i - points_range.first()) /
float(points_range.size() - 1)) :
0.0f;
const IndexRange points = points_by_curve[curve_i];
for (const int64_t point_i : points) {
const float curve_input = points.size() >= 2 ?
(float(point_i - points.first()) / float(points.size() - 1)) :
0.0f;
const float curve_factor = use_curve ? BKE_curvemapping_evaluateF(
omd.influence.custom_curve, 0, curve_input) :
1.0f;
@ -154,10 +154,8 @@ static void modify_fill_color(const GreasePencilOpacityModifierData &omd,
if (use_vgroup_opacity) {
/* Use the first stroke point as vertex weight. */
const IndexRange points_range = points_by_curve[curve_i];
const float stroke_weight = points_range.is_empty() ?
1.0f :
vgroup_weights.varray[points_range.first()];
const IndexRange points = points_by_curve[curve_i];
const float stroke_weight = points.is_empty() ? 1.0f : vgroup_weights.varray[points.first()];
const float stroke_influence = invert_vertex_group ? 1.0f - stroke_weight : stroke_weight;
fill_opacities.span[curve_i] = std::clamp(stroke_influence, 0.0f, 1.0f);