Cleanup: Modeling: Don't show failed object conversion as incompatible
Previously in b795f09e22 the variable
`incompatible_count` was increased when object conversion failed, this
was not logically correct since the objects type combination is
acceptable compatible, but it's the conversion itself has failed. Do not
increase `incompatible_count` value when this happens, this makes it
consistent with the error message
This commit is contained in:
@@ -2465,8 +2465,7 @@ static void make_object_duplilist_real(bContext *C,
|
||||
Object *object_eval = DEG_get_evaluated_object(depsgraph, base->object);
|
||||
|
||||
if (!(base->object->transflag & OB_DUPLI) &&
|
||||
!bke::object_has_geometry_set_instances(*object_eval))
|
||||
{
|
||||
!bke::object_has_geometry_set_instances(*object_eval)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4068,9 +4067,6 @@ static wmOperatorStatus object_convert_exec(bContext *C, wmOperator *op)
|
||||
if (newob) {
|
||||
BKE_object_materials_sync_length(bmain, newob, static_cast<ID *>(newob->data));
|
||||
}
|
||||
else {
|
||||
incompatible_count++;
|
||||
}
|
||||
|
||||
/* tag obdata if it was been changed */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user