From 9d335d29c775939b22dffedc303ecce9fec4e52f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Jul 2015 22:06:05 +1000 Subject: CustomData: quiet error on 0 element copy --- source/blender/blenkernel/intern/customdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index dbc79d3d8f2..2bf3657f920 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2155,8 +2155,8 @@ static void CustomData_copy_data_layer( src_offset = src_index * typeInfo->size; dst_offset = dst_index * typeInfo->size; - if (!src_data || !dst_data) { - if (!(src_data == NULL && dst_data == NULL)) { + if (!count || !src_data || !dst_data) { + if (count && !(src_data == NULL && dst_data == NULL)) { printf("%s: warning null data for %s type (%p --> %p), skipping\n", __func__, layerType_getName(source->layers[src_i].type), (void *)src_data, (void *)dst_data); -- cgit v1.2.3