From 932251caea88b87bd65dd5c453dd3133457ffb1b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 14 Aug 2018 13:35:51 +0200 Subject: [PATCH] Fix object copying not ensuring validity of material arrays. Related to T56363, this is not fixing the root of the bug, but ID copying should always be a good occasion to ensure sanity of our data (and error checking is always better than a crash!). --- source/blender/blenkernel/intern/object.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 86326655cfe..0cf2993133c 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1124,6 +1124,12 @@ void BKE_object_copy_data(Main *UNUSED(bmain), Object *ob_dst, const Object *ob_ ob_dst->matbits = MEM_dupallocN(ob_src->matbits); ob_dst->totcol = ob_src->totcol; } + else if (ob_dst->mat != NULL || ob_dst->matbits != NULL) { + /* This shall not be needed, but better be safe than sorry. */ + BLI_assert(!"Object copy: non-NULL material pointers with zero counter, should not happen."); + ob_dst->mat = NULL; + ob_dst->matbits = NULL; + } if (ob_src->iuser) ob_dst->iuser = MEM_dupallocN(ob_src->iuser); -- 2.28.0