diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-08 05:58:37 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-08 06:40:10 +0300 |
| commit | 87dfabc5453bec97bfe5b4f0f56890ea5f528bb8 (patch) | |
| tree | 9d5f3d99223c1df4016e8f9bd433198ddfb06518 /source/blender/editors/object/object_modifier.cc | |
| parent | 36b4b3b4d2d1c9260056afe7ec62c6b9a320be72 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into refactor-mesh-selection-generic
Diffstat (limited to 'source/blender/editors/object/object_modifier.cc')
| -rw-r--r-- | source/blender/editors/object/object_modifier.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index af4383f6857..061cec7739d 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -599,7 +599,7 @@ bool ED_object_modifier_convert_psys_to_mesh(ReportList *UNUSED(reports), MVert *mvert = verts.data(); MEdge *medge = edges.data(); - bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); + bke::MutableAttributeAccessor attributes = me->attributes_for_write(); bke::SpanAttributeWriter<bool> selection_vert = attributes.lookup_or_add_for_write_span<bool>( ".selection_vert", ATTR_DOMAIN_POINT); @@ -774,7 +774,7 @@ static bool modifier_apply_obdata( BKE_mesh_nomain_to_mesh(mesh_applied, me, ob, &CD_MASK_MESH, true); /* Anonymous attributes shouldn't be available on the applied geometry. */ - blender::bke::mesh_attributes_for_write(*me).remove_anonymous(); + me->attributes_for_write().remove_anonymous(); if (md_eval->type == eModifierType_Multires) { multires_customdata_delete(me); |