From 0945ae338b4e7752baaea445ac193c24ff2f4d57 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 15 Sep 2022 12:37:34 -0500 Subject: 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. --- source/blender/blenkernel/intern/customdata.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') 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(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); } -- cgit v1.2.3