diff options
author | Hans Goudey <h.goudey@me.com> | 2022-07-08 23:31:18 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-07-08 23:31:18 +0300 |
commit | 794819a45d74dcc071ee12a72e8339799e8f7619 (patch) | |
tree | 78f4103c6ce513f44a80e0121a2645b9d1f321bd /source/blender/editors | |
parent | b3380ba360b4d7fa5c5c9c9d52eb7e9e33a5a355 (diff) |
Fixes, cleanup, renaming
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editface.cc | 150 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.cc | 6 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 8 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_hide.c | 10 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 8 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_dyntopo.c | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_iterators.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 14 |
11 files changed, 118 insertions, 108 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 01d2cfc959f..24c7e9073a3 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -392,8 +392,8 @@ void ED_keymap_mesh(struct wmKeyConfig *keyconf); */ void paintface_flush_flags(struct bContext *C, struct Object *ob, - short flag, - const bool flush_hidden); + bool flush_selection, + bool flush_hidden); /** * \return True when pick finds an element or the selection changed. */ diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 4dd0c40c91b..6bc8a20bf31 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -9,8 +9,6 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_span.hh" -#include "BLI_virtual_array.hh" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -19,9 +17,9 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_attribute.hh" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_geometry_set.hh" #include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_object.h" @@ -37,20 +35,20 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -using blender::MutableSpan; -using blender::VArray; -using blender::bke::OutputAttribute_Typed; - /* own include */ -void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush_hidden) +void paintface_flush_flags(bContext *C, + Object *ob, + const bool flush_selection, + const bool flush_hidden) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); MPoly *polys, *mp_orig; const int *index_array = nullptr; int totpoly; - BLI_assert((flag & SELECT) || flush_hidden); + BLI_assert(flush_selection || flush_hidden); if (me == nullptr) { return; @@ -60,7 +58,7 @@ void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush /* we could call this directly in all areas that change selection, * since this could become slow for realtime updates (circle-select for eg) */ - if (flag & SELECT) { + if (flush_selection) { BKE_mesh_flush_select_from_polys(me); } @@ -71,8 +69,11 @@ void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush return; } + bke::AttributeAccessor attributes_me = bke::mesh_attributes(*me); Mesh *me_orig = (Mesh *)ob_eval->runtime.data_orig; + bke::MutableAttributeAccessor attributes_orig = bke::mesh_attributes_for_write(*me_orig); Mesh *me_eval = (Mesh *)ob_eval->runtime.data_eval; + bke::MutableAttributeAccessor attributes_eval = bke::mesh_attributes_for_write(*me_eval); bool updated = false; if (me_orig != nullptr && me_eval != nullptr && me_orig->totpoly == me->totpoly) { @@ -80,13 +81,17 @@ void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush for (int i = 0; i < me->totpoly; i++) { me_orig->mpoly[i].flag = me->mpoly[i].flag; } - - /* If the mesh has only deform modifiers, the evaluated mesh shares arrays. */ - if (me_eval->mpoly == me_orig->mpoly) { - updated = true; + if (flush_hidden) { + const VArray<bool> hide_face_me = attributes_me.lookup_or_default<bool>( + ".hide_face", ATTR_DOMAIN_FACE, false); + bke::SpanAttributeWriter<bool> hide_face_orig = + attributes_orig.lookup_or_add_for_write_only_span<bool>(".hide_face", ATTR_DOMAIN_FACE); + hide_face_me.materialize(hide_face_orig.span); + hide_face_orig.finish(); } + /* Mesh polys => Final derived polys */ - else if ((index_array = (const int *)CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX))) { + if ((index_array = (const int *)CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX))) { polys = me_eval->mpoly; totpoly = me_eval->totpoly; @@ -98,6 +103,17 @@ void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush polys[i].flag = mp_orig->flag; } } + const VArray<bool> hide_face_orig = attributes_orig.lookup_or_default<bool>( + ".hide_face", ATTR_DOMAIN_FACE, false); + bke::SpanAttributeWriter<bool> hide_face_eval = + attributes_eval.lookup_or_add_for_write_only_span<bool>(".hide_face", 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]; + } + } + hide_face_eval.finish(); updated = true; } @@ -122,80 +138,77 @@ void paintface_flush_flags(bContext *C, Object *ob, short flag, const bool flush void paintface_hide(bContext *C, Object *ob, const bool unselected) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); if (me == nullptr || me->totpoly == 0) { return; } - MeshComponent component; - component.replace(me, GeometryOwnershipType::Editable); - - OutputAttribute_Typed<bool> face_hide_attribute = - component.attribute_try_get_for_output_only<bool>(".hide_face", ATTR_DOMAIN_FACE); - MutableSpan<bool> face_hide = face_hide_attribute.as_span(); + bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); + bke::SpanAttributeWriter<bool> hide_face = attributes.lookup_or_add_for_write_span<bool>( + ".hide_face", ATTR_DOMAIN_FACE); for (int i = 0; i < me->totpoly; i++) { MPoly *mpoly = &me->mpoly[i]; - if (!face_hide[i]) { + if (!hide_face.span[i]) { if (((mpoly->flag & ME_FACE_SEL) == 0) == unselected) { - face_hide[i] = true; + hide_face.span[i] = true; } } - if (face_hide[i]) { + if (hide_face.span[i]) { mpoly->flag &= ~ME_FACE_SEL; } } - face_hide_attribute.save(); + hide_face.finish(); BKE_mesh_flush_hidden_from_polys(me); - paintface_flush_flags(C, ob, SELECT, true); + paintface_flush_flags(C, ob, true, true); } void paintface_reveal(bContext *C, Object *ob, const bool select) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); if (me == nullptr || me->totpoly == 0) { return; } - MeshComponent component; - component.replace(me, GeometryOwnershipType::Editable); + bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); if (select) { - const VArray<bool> face_hide = component.attribute_get_for_read<bool>( + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( ".hide_face", ATTR_DOMAIN_FACE, false); for (int i = 0; i < me->totpoly; i++) { MPoly *mpoly = &me->mpoly[i]; - if (face_hide[i]) { + if (hide_face[i]) { mpoly->flag |= ME_FACE_SEL; } } } - component.attribute_try_delete(".hide_face"); + attributes.remove(".hide_face"); BKE_mesh_flush_hidden_from_polys(me); - paintface_flush_flags(C, ob, SELECT, true); + paintface_flush_flags(C, ob, true, true); } /* Set object-mode face selection seams based on edge data, uses hash table to find seam edges. */ static void select_linked_tfaces_with_seams(Mesh *me, const uint index, const bool select) { + using namespace blender; bool do_it = true; bool mark = false; BLI_bitmap *edge_tag = BLI_BITMAP_NEW(me->totedge, __func__); BLI_bitmap *poly_tag = BLI_BITMAP_NEW(me->totpoly, __func__); - MeshComponent component; - component.replace(me, GeometryOwnershipType::Editable); - - const VArray<bool> face_hide = component.attribute_get_for_read<bool>( + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( ".hide_face", ATTR_DOMAIN_FACE, false); if (index != (uint)-1) { @@ -208,7 +221,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const uint index, const bo /* fill array by selection */ for (int i = 0; i < me->totpoly; i++) { MPoly *mp = &me->mpoly[i]; - if (face_hide[i]) { + if (hide_face[i]) { /* pass */ } else if (mp->flag & ME_FACE_SEL) { @@ -224,7 +237,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const uint index, const bo /* expand selection */ for (int i = 0; i < me->totpoly; i++) { MPoly *mp = &me->mpoly[i]; - if (face_hide[i]) { + if (hide_face[i]) { continue; } @@ -279,20 +292,19 @@ void paintface_select_linked(bContext *C, Object *ob, const int mval[2], const b select_linked_tfaces_with_seams(me, index, select); - paintface_flush_flags(C, ob, SELECT, false); + paintface_flush_flags(C, ob, true, false); } bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool flush_flags) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); if (me == nullptr) { return false; } - MeshComponent component; - component.replace(me, GeometryOwnershipType::Editable); - - const VArray<bool> face_hide = component.attribute_get_for_read<bool>( + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( ".hide_face", ATTR_DOMAIN_FACE, false); if (action == SEL_TOGGLE) { @@ -300,7 +312,7 @@ bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool fl for (int i = 0; i < me->totpoly; i++) { MPoly *mpoly = &me->mpoly[i]; - if (!face_hide[i] && mpoly->flag & ME_FACE_SEL) { + if (!hide_face[i] && mpoly->flag & ME_FACE_SEL) { action = SEL_DESELECT; break; } @@ -311,7 +323,7 @@ bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool fl for (int i = 0; i < me->totpoly; i++) { MPoly *mpoly = &me->mpoly[i]; - if (!face_hide[i]) { + if (!hide_face[i]) { switch (action) { case SEL_SELECT: if ((mpoly->flag & ME_FACE_SEL) == 0) { @@ -335,7 +347,7 @@ bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool fl if (changed) { if (flush_flags) { - paintface_flush_flags(C, ob, SELECT, false); + paintface_flush_flags(C, ob, true, false); } } return changed; @@ -343,6 +355,7 @@ bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool fl bool paintface_minmax(Object *ob, float r_min[3], float r_max[3]) { + using namespace blender; bool ok = false; float vec[3], bmat[3][3]; @@ -354,15 +367,13 @@ bool paintface_minmax(Object *ob, float r_min[3], float r_max[3]) copy_m3_m4(bmat, ob->obmat); - MeshComponent component; - component.replace(const_cast<Mesh *>(me), GeometryOwnershipType::ReadOnly); - - const VArray<bool> face_hide = component.attribute_get_for_read<bool>( + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( ".hide_face", ATTR_DOMAIN_FACE, false); for (int i = 0; i < me->totpoly; i++) { MPoly *mp = &me->mpoly[i]; - if (face_hide[i] || !(mp->flag & ME_FACE_SEL)) { + if (hide_face[i] || !(mp->flag & ME_FACE_SEL)) { continue; } @@ -384,6 +395,7 @@ bool paintface_mouse_select(bContext *C, const SelectPick_Params *params, Object *ob) { + using namespace blender; MPoly *mpoly_sel = nullptr; uint index; bool changed = false; @@ -392,16 +404,14 @@ bool paintface_mouse_select(bContext *C, /* Get the face under the cursor */ Mesh *me = BKE_mesh_from_object(ob); - MeshComponent component; - component.replace(const_cast<Mesh *>(me), GeometryOwnershipType::ReadOnly); - - const VArray<bool> face_hide = component.attribute_get_for_read<bool>( + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( ".hide_face", ATTR_DOMAIN_FACE, false); if (ED_mesh_pick_face(C, ob, mval, ED_MESH_PICK_DEFAULT_FACE_DIST, &index)) { if (index < me->totpoly) { mpoly_sel = me->mpoly + index; - if (!face_hide[index]) { + if (!hide_face[index]) { found = true; } } @@ -450,7 +460,7 @@ bool paintface_mouse_select(bContext *C, /* image window redraw */ - paintface_flush_flags(C, ob, SELECT, false); + paintface_flush_flags(C, ob, true, false); ED_region_tag_redraw(CTX_wm_region(C)); /* XXX: should redraw all 3D views. */ changed = true; } @@ -511,23 +521,24 @@ void paintvert_tag_select_update(bContext *C, Object *ob) bool paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); if (me == nullptr) { return false; } - MeshComponent component; - component.replace(const_cast<Mesh *>(me), GeometryOwnershipType::ReadOnly); - - const VArray<bool> vert_hide = component.attribute_get_for_read<bool>( - "vert_hide", ATTR_DOMAIN_POINT, false); + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_vert = attributes.lookup_or_default<bool>( + ".hide_vert", ATTR_DOMAIN_POINT, false); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( + ".hide_face", ATTR_DOMAIN_FACE, false); if (action == SEL_TOGGLE) { action = SEL_SELECT; for (int i = 0; i < me->totvert; i++) { MVert *mvert = &me->mvert[i]; - if (!vert_hide[i] && mvert->flag & SELECT) { + if (!hide_face[i] && mvert->flag & SELECT) { action = SEL_DESELECT; break; } @@ -537,7 +548,7 @@ bool paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags) bool changed = false; for (int i = 0; i < me->totvert; i++) { MVert *mvert = &me->mvert[i]; - if (!vert_hide[i]) { + if (!hide_vert[i]) { switch (action) { case SEL_SELECT: if ((mvert->flag & SELECT) == 0) { @@ -580,6 +591,7 @@ bool paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags) void paintvert_select_ungrouped(Object *ob, bool extend, bool flush_flags) { + using namespace blender; Mesh *me = BKE_mesh_from_object(ob); if (me == nullptr || me->dvert == nullptr) { @@ -590,16 +602,14 @@ void paintvert_select_ungrouped(Object *ob, bool extend, bool flush_flags) paintvert_deselect_all_visible(ob, SEL_DESELECT, false); } - MeshComponent component; - component.replace(const_cast<Mesh *>(me), GeometryOwnershipType::ReadOnly); - - const VArray<bool> vert_hide = component.attribute_get_for_read<bool>( - "vert_hide", ATTR_DOMAIN_POINT, false); + bke::AttributeAccessor attributes = bke::mesh_attributes(*me); + const VArray<bool> hide_face = attributes.lookup_or_default<bool>( + ".hide_face", ATTR_DOMAIN_FACE, false); for (int i = 0; i < me->totvert; i++) { MVert *mv = &me->mvert[i]; MDeformVert *dv = &me->dvert[i]; - if (!vert_hide[i]) { + if (!hide_face[i]) { if (dv->dw == nullptr) { /* if null weight then not grouped */ mv->flag |= SELECT; diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 4bd3ef166f3..af8084e16c4 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -596,7 +596,7 @@ static void *undomesh_from_editmesh(UndoMesh *um, BMEditMesh *em, Key *key, Undo /* Copy the ID name characters to the mesh so code that depends on accessing the ID type can work * on it. Necessary to use the attribute API. */ - strcpy(um->me.id.name, "ME"); + strcpy(um->me.id.name, "MEundomesh_from_editmesh"); BM_mesh_bm_to_me( NULL, diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index 33dfab95e7b..b1004b23a21 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -1329,7 +1329,7 @@ bool ED_mesh_pick_face_vert( */ struct VertPickData { const MVert *mvert; - const bool *vert_hide; + const bool *hide_vert; const float *mval_f; /* [2] */ ARegion *region; @@ -1344,7 +1344,7 @@ static void ed_mesh_pick_vert__mapFunc(void *userData, const float UNUSED(no[3])) { VertPickData *data = static_cast<VertPickData *>(userData); - if (data->vert_hide && data->vert_hide[index]) { + if (data->hide_vert && data->hide_vert[index]) { return; } float sco[2]; @@ -1417,7 +1417,7 @@ bool ED_mesh_pick_vert( data.mval_f = mval_f; data.len_best = FLT_MAX; data.v_idx_best = -1; - data.vert_hide = (const bool *)CustomData_get_layer_named( + data.hide_vert = (const bool *)CustomData_get_layer_named( &me_eval->vdata, CD_PROP_BOOL, ".hide_vert"); BKE_mesh_foreach_mapped_vert(me_eval, ed_mesh_pick_vert__mapFunc, &data, MESH_FOREACH_NOP); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index d3c5f22ff6d..4bba316d48b 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1034,7 +1034,7 @@ static void vgroup_select_verts(Object *ob, int select) } else { if (me->dvert) { - const bool *vert_hide = CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); + const bool *hide_vert = CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); MVert *mv; MDeformVert *dv; int i; @@ -1043,7 +1043,7 @@ static void vgroup_select_verts(Object *ob, int select) dv = me->dvert; for (i = 0; i < me->totvert; i++, mv++, dv++) { - if (!vert_hide[i]) { + if (hide_vert != NULL && !hide_vert[i]) { if (BKE_defvert_find_index(dv, def_nr)) { if (select) { mv->flag |= SELECT; @@ -1931,11 +1931,11 @@ static void vgroup_smooth_subset(Object *ob, #define IS_BM_VERT_READ(v) (use_hide ? (BM_elem_flag_test(v, BM_ELEM_HIDDEN) == 0) : true) #define IS_BM_VERT_WRITE(v) (use_select ? (BM_elem_flag_test(v, BM_ELEM_SELECT) != 0) : true) - const bool *vert_hide = me ? (const bool *)CustomData_get_layer_named( + const bool *hide_vert = me ? (const bool *)CustomData_get_layer_named( &me->vdata, CD_PROP_BOOL, ".hide_vert") : NULL; -#define IS_ME_VERT_READ(v) (use_hide ? (vert_hide && vert_hide[v]) : true) +#define IS_ME_VERT_READ(v) (use_hide ? (hide_vert && hide_vert[v]) : true) #define IS_ME_VERT_WRITE(v) (use_select ? (((v)->flag & SELECT) != 0) : true) /* initialize used verts */ diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 564a90238b7..c904d533db8 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -78,9 +78,9 @@ static void partialvis_update_mesh(Object *ob, BKE_pbvh_node_get_verts(pbvh, node, &vert_indices, &mvert); paint_mask = CustomData_get_layer(&me->vdata, CD_PAINT_MASK); - bool *vert_hide = CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); - if (!vert_hide) { - vert_hide = CustomData_add_layer_named( + bool *hide_vert = CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); + if (hide_vert == NULL) { + hide_vert = CustomData_add_layer_named( &me->vdata, CD_PROP_BOOL, CD_CALLOC, NULL, me->totvert, ".hide_vert"); } @@ -92,11 +92,11 @@ static void partialvis_update_mesh(Object *ob, /* Hide vertex if in the hide volume. */ if (is_effected(area, planes, v->co, vmask)) { - vert_hide[vert_indices[i]] = (action == PARTIALVIS_HIDE); + hide_vert[vert_indices[i]] = (action == PARTIALVIS_HIDE); any_changed = true; } - if (!vert_hide[vert_indices[i]]) { + if (!hide_vert[vert_indices[i]]) { any_visible = true; } } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 60d2a5b07f7..7b7d620d9b3 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -342,8 +342,8 @@ void SCULPT_vertex_visible_set(SculptSession *ss, int index, bool visible) { switch (BKE_pbvh_type(ss->pbvh)) { case PBVH_FACES: { - bool *vert_hide = BKE_pbvh_get_vert_hide_for_write(ss->pbvh); - vert_hide[index] = visible; + bool *hide_vert = BKE_pbvh_get_vert_hide_for_write(ss->pbvh); + hide_vert[index] = visible; BKE_pbvh_vert_mark_update(ss->pbvh, index); break; } @@ -359,8 +359,8 @@ bool SCULPT_vertex_visible_get(SculptSession *ss, int index) { switch (BKE_pbvh_type(ss->pbvh)) { case PBVH_FACES: { - const bool *vert_hide = BKE_pbvh_get_vert_hide(ss->pbvh); - return vert_hide == NULL || !vert_hide[index]; + const bool *hide_vert = BKE_pbvh_get_vert_hide(ss->pbvh); + return hide_vert == NULL || !hide_vert[index]; } case PBVH_BMESH: return !BM_elem_flag_test(BM_vert_at_index(ss->bm, index), BM_ELEM_HIDDEN); diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c index 01c1866eeca..bed9af79b9c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c @@ -223,9 +223,9 @@ static void SCULPT_dynamic_topology_disable_ex( me->face_sets_color_default = 1; /* Sync the visibility to vertices manually as the pmap is still not initialized. */ - bool *vert_hide = (bool *)CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); - if (vert_hide) { - memset(vert_hide, 0, sizeof(bool) * me->totvert); + bool *hide_vert = (bool *)CustomData_get_layer_named(&me->vdata, CD_PROP_BOOL, ".hide_vert"); + if (hide_vert != NULL) { + memset(hide_vert, 0, sizeof(bool) * me->totvert); } } diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index a70e8b9aa32..a2758937e10 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -312,13 +312,13 @@ static bool sculpt_undo_restore_hidden(bContext *C, SculptUndoNode *unode) SculptSession *ss = ob->sculpt; SubdivCCG *subdiv_ccg = ss->subdiv_ccg; - bool *vert_hide = BKE_pbvh_get_vert_hide_for_write(ss->pbvh); + bool *hide_vert = BKE_pbvh_get_vert_hide_for_write(ss->pbvh); if (unode->maxvert) { for (int i = 0; i < unode->totvert; i++) { - if ((BLI_BITMAP_TEST(unode->vert_hidden, i) != 0) != vert_hide[i]) { + if ((BLI_BITMAP_TEST(unode->vert_hidden, i) != 0) != hide_vert[i]) { BLI_BITMAP_FLIP(unode->vert_hidden, i); - vert_hide[i] = !vert_hide[i]; + hide_vert[i] = !hide_vert[i]; BKE_pbvh_vert_mark_update(ss->pbvh, unode->index[i]); } } @@ -1190,8 +1190,8 @@ static void sculpt_undo_store_hidden(Object *ob, SculptUndoNode *unode) PBVH *pbvh = ob->sculpt->pbvh; PBVHNode *node = unode->node; - const bool *vert_hide = BKE_pbvh_get_vert_hide(pbvh); - if (vert_hide == NULL) { + const bool *hide_vert = BKE_pbvh_get_vert_hide(pbvh); + if (hide_vert == NULL) { return; } @@ -1206,7 +1206,7 @@ static void sculpt_undo_store_hidden(Object *ob, SculptUndoNode *unode) BKE_pbvh_node_num_verts(pbvh, node, NULL, &allvert); BKE_pbvh_node_get_verts(pbvh, node, &vert_indices, &mvert); for (int i = 0; i < allvert; i++) { - BLI_BITMAP_SET(unode->vert_hidden, i, vert_hide[vert_indices[i]]); + BLI_BITMAP_SET(unode->vert_hidden, i, hide_vert[vert_indices[i]]); } } } diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index 09285006aaf..6256eeb9621 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -205,7 +205,7 @@ typedef struct foreachScreenObjectVert_userData { void (*func)(void *userData, MVert *mv, const float screen_co[2], int index); void *userData; ViewContext vc; - const bool *vert_hide; + const bool *hide_vert; eV3DProjTest clip_flag; } foreachScreenObjectVert_userData; @@ -263,7 +263,7 @@ static void meshobject_foreachScreenVert__mapFunc(void *userData, const float UNUSED(no[3])) { foreachScreenObjectVert_userData *data = userData; - if (data->vert_hide && data->vert_hide[index]) { + if (data->hide_vert && data->hide_vert[index]) { return; } struct MVert *mv = &((Mesh *)(data->vc.obact->data))->mvert[index]; @@ -299,7 +299,7 @@ void meshobject_foreachScreenVert( data.func = func; data.userData = userData; data.clip_flag = clip_flag; - data.vert_hide = (const bool *)CustomData_get_layer_named( + data.hide_vert = (const bool *)CustomData_get_layer_named( &me->vdata, CD_PROP_BOOL, ".hide_vert"); if (clip_flag & V3D_PROJ_TEST_CLIP_BB) { diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 0163f2a171a..f589ecb233d 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -342,11 +342,11 @@ static bool edbm_backbuf_check_and_select_verts_obmode(Mesh *me, const BLI_bitmap *select_bitmap = esel->select_bitmap; - const bool *vert_hide = (const bool *)CustomData_get_layer_named( + const bool *hide_vert = (const bool *)CustomData_get_layer_named( &me->vdata, CD_PROP_BOOL, ".hide_vert"); for (int index = 0; index < me->totvert; index++, mv++) { - if (!(vert_hide && vert_hide[index])) { + if (!(hide_vert && hide_vert[index])) { const bool is_select = mv->flag & SELECT; const bool is_inside = BLI_BITMAP_TEST_BOOL(select_bitmap, index); const int sel_op_result = ED_select_op_action_deselected(sel_op, is_select, is_inside); @@ -373,11 +373,11 @@ static bool edbm_backbuf_check_and_select_faces_obmode(Mesh *me, const BLI_bitmap *select_bitmap = esel->select_bitmap; - const bool *face_hide = (const bool *)CustomData_get_layer_named( + const bool *hide_face = (const bool *)CustomData_get_layer_named( &me->vdata, CD_PROP_BOOL, ".hide_face"); for (int index = 0; index < me->totpoly; index++, mpoly++) { - if (!(face_hide && face_hide[index])) { + if (!(hide_face && hide_face[index])) { const bool is_select = mpoly->flag & ME_FACE_SEL; const bool is_inside = BLI_BITMAP_TEST_BOOL(select_bitmap, index); const int sel_op_result = ED_select_op_action_deselected(sel_op, is_select, is_inside); @@ -1268,7 +1268,7 @@ static bool do_lasso_select_paintface(ViewContext *vc, } if (changed) { - paintface_flush_flags(vc->C, ob, SELECT, false); + paintface_flush_flags(vc->C, ob, true, false); } return changed; } @@ -3192,7 +3192,7 @@ static bool do_paintface_box_select(ViewContext *vc, } if (changed) { - paintface_flush_flags(vc->C, vc->obact, SELECT, false); + paintface_flush_flags(vc->C, vc->obact, true, false); } return changed; } @@ -4093,7 +4093,7 @@ static bool paint_facesel_circle_select(ViewContext *vc, } if (changed) { - paintface_flush_flags(vc->C, ob, SELECT, false); + paintface_flush_flags(vc->C, ob, true, false); } return changed; } |