Commit: 9d335d29c775939b22dffedc303ecce9fec4e52f
Author: Campbell Barton
Date: Thu Jul 30 22:06:05 2015 +1000
Branches: master
https://developer.blender.org/rB9d335d29c775939b22dffedc303ecce9fec4e52f
CustomData: quiet error on 0 element copy
===================================================================
M source/blender/blenkernel/intern/customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index dbc79d3..2bf3657 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
