blender
/
blender
134
421
Fork 604
Code Issues 6.4k Pull Requests 770 Projects 19 Wiki Activity

GPv3: Tint and Color modifiers #117297

Merged
Lukas Tönne merged 20 commits from LukasTonne/blender:gp3-color-modifier into main 2024-01-19 16:59:49 +01:00
Conversation 3 Commits 20 Files Changed 10 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a18bc63e29 - Show all commits

11
source/blender/modifiers/intern/MOD_grease_pencil_tint.cc
View File

@ -248,6 +248,12 @@ static void modify_fill_color(Object *ob,
const bool invert_vertex_group = (tmd.influence.flag &
GREASE_PENCIL_INFLUENCE_INVERT_VERTEX_GROUP);
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
const GreasePencilTintModifierMode tint_mode = GreasePencilTintModifierMode(tmd.tint_mode);
/* Check early before getting attribute writers. */
if (tint_mode == MOD_GREASE_PENCIL_TINT_GRADIENT && tmd.object == nullptr) {
return;
}
bke::MutableAttributeAccessor attributes = curves.attributes_for_write();
/* Fill color per stroke. */
@ -278,7 +284,6 @@ static void modify_fill_color(Object *ob,
return tmd.factor;
};
const GreasePencilTintModifierMode tint_mode = GreasePencilTintModifierMode(tmd.tint_mode);
switch (tint_mode) {
case MOD_GREASE_PENCIL_TINT_UNIFORM: {
curves_mask.foreach_index(GrainSize(512), [&](int64_t curve_i) {
@ -291,10 +296,6 @@ static void modify_fill_color(Object *ob,
break;
}
case MOD_GREASE_PENCIL_TINT_GRADIENT: {
if (tmd.object == nullptr) {
return;
}
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
const Span<float3> positions = curves.positions();
/* Transforms points to the gradient object space. */