blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Bastien Montagne 2018-08-14 14:10:47 +02:00
parent 1f78e86070 6eb5b418ee
commit 1b53838548
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/object.c
View File

@ -1246,6 +1246,12 @@ void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, con
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);

3
source/blender/editors/object/object_add.c
View File

@ -2098,6 +2098,9 @@ static int convert_exec(bContext *C, wmOperator *op)
continue;
}
/* Ensure new object has consistent material data with its new obdata. */
test_object_materials(bmain, newob, newob->data);
/* tag obdata if it was been changed */
/* If the original object is active then make this object active */