blender
/
blender
134
424
Fork 606
Code Issues 6.4k Pull Requests 774 Projects 19 Wiki Activity

GPv3: Soft mode for the Eraser tool #110310

Open
Amélie Fondevilla wants to merge 59 commits from amelief/blender:gpv3-erase-operator-soft-mode into main
pull from: amelief/blender:gpv3-erase-operator-soft-mode
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 59 Files Changed 3 +14 -4
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6dae3db420 - Show all commits

18
source/blender/editors/sculpt_paint/grease_pencil_erase.cc
View File

@ -667,7 +667,7 @@ struct EraseOperationExecutor {
return true;
}
void soft_eraser(const blender::bke::CurvesGeometry &src,
bool soft_eraser(const blender::bke::CurvesGeometry &src,
const Array<float2> &screen_space_positions,
blender::bke::CurvesGeometry &dst)
{
@ -698,15 +698,22 @@ struct EraseOperationExecutor {
}
/* Decrease the opacities. */
bool opacity_changed = false;
threading::parallel_for(src.points_range(), 256, [&](const IndexRange src_points) {
for (const int src_point : src_points) {
if (contains_point(screen_space_positions[src_point])) {
const float point_opacity = src_opacity[src_point];
src_new_opacity[src_point] = std::max(0.0f, point_opacity - opacity_decrease_step);
opacity_changed = true;
}
}
});
/* Return early if nothing changed. */
if (!opacity_changed) {
return false;
}
/* Compute destination points */
const auto is_point_transparent = [&](const int src_point) {
return (src_new_opacity[src_point] < opacity_threshold);
@ -744,7 +751,8 @@ struct EraseOperationExecutor {
});
dst_opacity.finish();
return;
/* Note : the opacities were changed, so we still need to tag for changes. */
return true;
}
/* Topology change. */
@ -763,7 +771,7 @@ struct EraseOperationExecutor {
/* Return early if no points left */
if (dst_points_num == 0) {
dst.resize(0, 0);
return;
return true;
}
/* Set the intersection parameters in the destination domain : a pair of int and float numbers
@ -899,6 +907,8 @@ struct EraseOperationExecutor {
opacity_attr, ATTR_DOMAIN_POINT);
array_utils::gather(src_new_opacity.as_span(), dst_to_src_point.as_span(), dst_opacity.span);
dst_opacity.finish();
return true;
}
bool stroke_eraser(const bke::CurvesGeometry &src,
@ -1012,7 +1022,7 @@ struct EraseOperationExecutor {
erased = hard_eraser(src, screen_space_positions, dst, self.keep_caps);
break;
case GP_BRUSH_ERASER_SOFT:
soft_eraser(src, screen_space_positions, dst);
erased = soft_eraser(src, screen_space_positions, dst);
break;
}