diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-07-30 15:06:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-30 15:14:59 +0300 |
commit | 9d335d29c775939b22dffedc303ecce9fec4e52f (patch) | |
tree | 4a900ac3d272d042de3d4aca9fb5078c002fbfc3 /source | |
parent | 2ae67de94437162a9d429850b04a295fa393d971 (diff) |
CustomData: quiet error on 0 element copy
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |