blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #106999: Converting curves to particle system can lead to crash #118392

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:106999 into blender-v4.1-release 2024-02-16 18:25:57 +01:00
Conversation 0 Commits 2 Files Changed 1 +11 -5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/curves/intern/curves_ops.cc
View File

@ -280,7 +280,15 @@ static void try_convert_single_object(Object &curves_ob,
*r_could_not_convert_some_curves = true;
}
const int hair_num = curves.curves_num();
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
IndexMaskMemory memory;
const IndexMask multi_point_curves = IndexMask::from_predicate(
curves.curves_range(), GrainSize(4096), memory, [&](const int curve_i) {
return points_by_curve[curve_i].size() > 1;
});
const int hair_num = multi_point_curves.size();
if (hair_num == 0) {
return;
}
@ -327,11 +335,9 @@ static void try_convert_single_object(Object &curves_ob,
const bke::CurvesSurfaceTransforms transforms{curves_ob, &surface_ob};
const MFace *mfaces = (const MFace *)CustomData_get_layer(&surface_me.fdata_legacy, CD_MFACE);
const OffsetIndices points_by_curve = curves.points_by_curve();
const Span<float3> positions = surface_me.vert_positions();
for (const int new_hair_i : IndexRange(hair_num)) {
const int curve_i = new_hair_i;
multi_point_curves.foreach_index([&](const int curve_i, const int new_hair_i) {
Hans Goudey commented 2024-02-16 18:04:19 +01:00
Outdated
Review
Copy Link

I would suggest not making this multi-threaded (removing GrainSize(256)), or at least doing that in a separate commit only to main.

I would suggest not making this multi-threaded (removing `GrainSize(256)`), or at least doing that in a separate commit only to main.
const IndexRange points = points_by_curve[curve_i];
const float3 &root_pos_cu = positions_cu[points.first()];
@ -382,7 +388,7 @@ static void try_convert_single_object(Object &curves_ob,
key.time = 100.0f * key_fac;
key.weight = 1.0f - key_fac;
}
}
});
particle_system->particles = particles.data();
particle_system->totpart = particles.size();