diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-21 15:12:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-21 15:12:50 +0300 |
| commit | d6b542b85470e97fb268ce51ef5e53a70f54cae9 (patch) | |
| tree | c795946963e95928d8c0806c7d9753f5719a1a88 /source/blender/blenkernel/intern/customdata.c | |
| parent | 8691a58a8076edad89aa26efef6ed1cfe44ca8cf (diff) | |
Fix T65948: boolean modifier does not merge UV maps with the same name
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 9b7a6002035..76098db5fd1 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1888,7 +1888,7 @@ bool CustomData_merge(const struct CustomData *source, else if ((maxnumber != -1) && (number >= maxnumber)) { continue; } - else if (CustomData_get_layer_named(dest, type, layer->name)) { + else if (CustomData_get_named_layer_index(dest, type, layer->name) != -1) { continue; } |