diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-15 20:52:53 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-15 20:52:53 +0300 |
| commit | 5fecf7c571d6204459292c2c54c47a6206217e5e (patch) | |
| tree | e68d5c9929107559ee88dcb667319105236b1f8d /source/blender/blenkernel/intern/customdata.cc | |
| parent | 77b03bdf0f3364571157aa958c9c709f96aec622 (diff) | |
| parent | 0945ae338b4e7752baaea445ac193c24ff2f4d57 (diff) | |
Merge branch 'master' into refactor-mesh-selection-generic
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 403cf2a5449..fadf24beafe 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -3758,7 +3758,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); } |