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

Fix #137449: Face Set gesture in Dyntopo doesn't create attribute

Browse Source 
Prior to this commit, Using the gesture Face Set operators on a mesh
that doesn't have the `.sculpt_face_set` attribute created would lead to
invalid data being written and ultimately a crash.

To fix this, use the `ensure_face_sets_bmesh` function.

This commit also ensures that the `find_next_available_id` function
doesn't return `1` for the next face set id for BMesh.

Pull Request: https://projects.blender.org/blender/blender/pulls/137492
This commit is contained in:
Sean Kim
2025-04-15 03:51:01 +02:00
committed by Sean Kim
parent f8622702f5
commit 1f003c08ee
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/sculpt_paint/sculpt_face_set.cc
View File

@@ -101,7 +101,8 @@ int find_next_available_id(Object &object)
const int cd_offset = CustomData_get_offset_named(
&bm.pdata, CD_PROP_INT32, ".sculpt_face_set");
if (cd_offset == -1) {
return 1;
/* Default face set ID is 1, so the next available id should never be 1 */
return 2;
}
int next_face_set = 1;
BMIter iter;
@@ -1739,11 +1740,9 @@ static void gesture_apply_bmesh(gesture::GestureData &gesture_data, const IndexM
FaceSetOperation *face_set_operation = (FaceSetOperation *)gesture_data.operation;
const Depsgraph &depsgraph = *gesture_data.vc.depsgraph;
const int new_face_set = face_set_operation->new_face_set_id;
SculptSession &ss = *gesture_data.ss;
bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(*gesture_data.vc.obact);
MutableSpan<bke::pbvh::BMeshNode> nodes = pbvh.nodes<bke::pbvh::BMeshNode>();
BMesh *bm = ss.bm;
const int offset = CustomData_get_offset_named(&bm->pdata, CD_PROP_INT32, ".sculpt_face_set");
const int offset = face_set::ensure_face_sets_bmesh(*gesture_data.vc.obact);
Array<bool> node_changed(node_mask.min_array_size(), false);