From 62d1ed0120b26cd0860aa430ba2a03da74968556 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 12 Aug 2022 08:57:38 +1000 Subject: Cleanup: replace term face with poly Be consistent with naming to avoid mixing MPoly/MFace. --- source/blender/editors/mesh/editface.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 96a493cba49..b1e1e94e5f7 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -82,12 +82,12 @@ void paintface_flush_flags(bContext *C, me_orig->mpoly[i].flag = me->mpoly[i].flag; } if (flush_hidden) { - const VArray hide_face_me = attributes_me.lookup_or_default( + const VArray hide_poly_me = attributes_me.lookup_or_default( ".hide_poly", ATTR_DOMAIN_FACE, false); - bke::SpanAttributeWriter hide_face_orig = + bke::SpanAttributeWriter hide_poly_orig = attributes_orig.lookup_or_add_for_write_only_span(".hide_poly", ATTR_DOMAIN_FACE); - hide_face_me.materialize(hide_face_orig.span); - hide_face_orig.finish(); + hide_poly_me.materialize(hide_poly_orig.span); + hide_poly_orig.finish(); } /* Mesh polys => Final derived polys */ @@ -103,17 +103,17 @@ void paintface_flush_flags(bContext *C, polys[i].flag = mp_orig->flag; } } - const VArray hide_face_orig = attributes_orig.lookup_or_default( + const VArray hide_poly_orig = attributes_orig.lookup_or_default( ".hide_poly", ATTR_DOMAIN_FACE, false); - bke::SpanAttributeWriter hide_face_eval = + bke::SpanAttributeWriter hide_poly_eval = attributes_eval.lookup_or_add_for_write_only_span(".hide_poly", ATTR_DOMAIN_FACE); for (const int i : IndexRange(me_eval->totpoly)) { - const int orig_face_index = index_array[i]; - if (orig_face_index != ORIGINDEX_NONE) { - hide_face_eval.span[i] = hide_face_orig[orig_face_index]; + const int orig_poly_index = index_array[i]; + if (orig_poly_index != ORIGINDEX_NONE) { + hide_poly_eval.span[i] = hide_poly_orig[orig_poly_index]; } } - hide_face_eval.finish(); + hide_poly_eval.finish(); updated = true; } -- cgit v1.2.3