Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / object / object_add.c
index f41c4071634a9929dcb35927d4b0ef2641fe25a5..8b4412ed6f97f12d03a0db0efbc698102d4416d3 100644 (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 */