diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-09-21 09:42:34 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-09-21 09:42:34 +0400 |
| commit | 1ce98989e53bae8e4cb7589eb32b043d3e6df05c (patch) | |
| tree | 445c4c91004f0be5a68b19dbe4a8ea966df9bfe3 /source/blender/blenkernel/BKE_customdata.h | |
| parent | 50fbb6c07e6864cb5a2300858f28a0f0ce3ac1af (diff) | |
bugfix: [#36786] customdata layers are not merging taken the names into consideration
(which is also "[#36749] Joining objects with more than one uv map depends on list order")
Thanks Bastien Montagne and Brecht van Lommel for reviewing and some advice.
Diffstat (limited to 'source/blender/blenkernel/BKE_customdata.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index d47d03fe903..5a283922707 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -192,6 +192,9 @@ void CustomData_set_only_copy(const struct CustomData *data, void CustomData_copy_data(const struct CustomData *source, struct CustomData *dest, int source_index, int dest_index, int count); +void CustomData_copy_data_named(const struct CustomData *source, + struct CustomData *dest, int source_index, + int dest_index, int count); void CustomData_copy_elements(int type, void *source, void *dest, int count); void CustomData_bmesh_copy_data(const struct CustomData *source, struct CustomData *dest, void *src_block, |