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

Fix: GPv3: Crash in simplify modifier

Browse Source 
The simplify modifier uses
`bke::curves_copy_point_selection` but didn't
build the `points_to_keep` index mask correctly.
This fixes the indices in the index mask and also
optimizes the edge cases of removing all the points/
keeping all the points.
This commit is contained in:
Falk David
2024-03-29 16:13:39 +01:00
parent c78c6b0bdf
commit 96de8112ee
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/modifiers/intern/MOD_grease_pencil_simplify.cc
View File

@@ -88,11 +88,11 @@ static IndexMask simplify_fixed(const bke::CurvesGeometry &curves,
curves.points_range(), GrainSize(2048), memory, [&](const int64_t i) {
const int curve_i = point_to_curve_map[i];
const IndexRange points = points_by_curve[curve_i];
if (points.drop_front(1).drop_back(1).contains(i)) {
const int local_i = i - points.start();
return local_i % int(math::pow(2.0f, float(step - 1))) == 0;
if (points.size() <= 2) {
return true;
}
return false;
const int local_i = i - points.start();
return (local_i % int(math::pow(2.0f, float(step - 1))) == 0) || points.last() == i;
});
}
@@ -280,6 +280,13 @@ static void simplify_drawing(const GreasePencilSimplifyModifierData &mmd,
switch (mmd.mode) {
case MOD_GREASE_PENCIL_SIMPLIFY_FIXED: {
const IndexMask points_to_keep = simplify_fixed(curves, mmd.step, memory);
if (points_to_keep.is_empty()) {
drawing.strokes_for_write() = {};
break;
}
if (points_to_keep.size() == curves.points_num()) {
break;
}
drawing.strokes_for_write() = bke::curves_copy_point_selection(curves, points_to_keep, {});
break;
}