From a76b2bfbcc123baed38b39cf957033a736c4a9d7 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 11 Jan 2024 15:59:27 -0500 Subject: [PATCH] Cleanup: Small change to face set scupt undo Flip condition to un-indent code, change order of variable declarations. --- .../blender/editors/sculpt_paint/sculpt_undo.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 40d267a3e2c..060a81f431c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -655,19 +655,17 @@ static bool restore_mask(Object *ob, Node &unode, MutableSpan modified_ver static bool restore_face_sets(Object *ob, Node &unode, MutableSpan modified_face_set_faces) { - bke::SpanAttributeWriter face_sets = face_set::ensure_face_sets_mesh(*ob); - - bool modified = false; const Span face_indices = unode.face_indices; + bke::SpanAttributeWriter face_sets = face_set::ensure_face_sets_mesh(*ob); + bool modified = false; for (const int i : face_indices.index_range()) { - int face_index = face_indices[i]; - if (unode.face_sets[i] != face_sets.span[face_index]) { - modified_face_set_faces[face_index] = true; - modified = true; + const int face = face_indices[i]; + if (unode.face_sets[i] == face_sets.span[face]) { + continue; } - - std::swap(unode.face_sets[i], face_sets.span[face_index]); + modified_face_set_faces[face] = true; + modified = true; } face_sets.finish(); return modified;