diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-08-31 16:07:51 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-08-31 16:15:09 +0300 |
| commit | 3ecb21346248014aff621ec3b97ccbc1e7774653 (patch) | |
| tree | b571a51b93d61efc01bf8a75a74ecade8e463d16 /source/blender/blenkernel/intern/object.cc | |
| parent | b5af7f967e6d5d2e7432d6efa2f47050a5bfc576 (diff) | |
| parent | 773241add9d876aa0b4ba011745208f61b53a4e2 (diff) | |
Merge branch 'master' into refactor-mesh-material-index-genericrefactor-mesh-material-index-generic
Diffstat (limited to 'source/blender/blenkernel/intern/object.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/object.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 2a85811e2e8..c90c83074bd 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -1665,7 +1665,7 @@ static void copy_ccg_data(Mesh *mesh_destination, Mesh *mesh_source, int layer_t const int layer_index = CustomData_get_layer_index(data_destination, layer_type); CustomData_free_layer(data_destination, layer_type, num_elements, layer_index); BLI_assert(!CustomData_has_layer(data_destination, layer_type)); - CustomData_add_layer(data_destination, layer_type, CD_CALLOC, nullptr, num_elements); + CustomData_add_layer(data_destination, layer_type, CD_SET_DEFAULT, nullptr, num_elements); BLI_assert(CustomData_has_layer(data_destination, layer_type)); CustomData_copy_layer_type_data(data_source, data_destination, layer_type, 0, 0, num_elements); } |