[Bf-blender-cvs] [d6b542b8547] master: Fix T65948: boolean modifier does not merge UV maps with the same name

[Brecht Van Lommel]

Commit: d6b542b85470e97fb268ce51ef5e53a70f54cae9
Author: Brecht Van Lommel
Date:   Fri Jun 21 14:12:50 2019 +0200
Branches: master
https://developer.blender.org/rBd6b542b85470e97fb268ce51ef5e53a70f54cae9

Fix T65948: boolean modifier does not merge UV maps with the same name

===================================================================

M	source/blender/blenkernel/intern/customdata.c

===================================================================

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;
     }