diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-15 20:37:34 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-15 20:52:18 +0300 |
| commit | 0945ae338b4e7752baaea445ac193c24ff2f4d57 (patch) | |
| tree | 685e93974b65c4b4589c3f143aad55cc8c99ea57 /source/blender/blenkernel/intern/customdata.cc | |
| parent | 8b26349d5777179808792ab123f98f5a90428754 (diff) | |
Fix: Merging mesh and non-empty BMesh creates "flag" attributes
We need to use the custom data copy function that skips mesh-only
attributes like the hide status attributes, the generic material index
attribute, etc. Otherwise the BMesh has those attributes which
conflict with their builtin counterparts.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 82a1a2aa8f6..64e2d00dc1b 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -3751,7 +3751,7 @@ bool CustomData_bmesh_merge(const CustomData *source, destold.layers = static_cast<CustomDataLayer *>(MEM_dupallocN(destold.layers)); } - if (CustomData_merge(source, dest, mask, alloctype, 0) == false) { + if (CustomData_merge_mesh_to_bmesh(source, dest, mask, alloctype, 0) == false) { if (destold.layers) { MEM_freeN(destold.layers); } |