Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenkernel/intern/customdata.c2
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;
}