Merge branch 'blender-v3.3-release'

This commit is contained in:
Philipp Oeser 2022-08-25 09:25:22 +02:00
commit e50c7a244b
1 changed files with 5 additions and 0 deletions

View File

@ -687,6 +687,11 @@ static void rna_Object_parent_type_set(PointerRNA *ptr, int value)
{
Object *ob = (Object *)ptr->data;
/* Skip if type did not change (otherwise we loose parent inverse in ED_object_parent). */
if (ob->partype == value) {
return;
}
ED_object_parent(ob, ob->parent, value, ob->parsubstr);
}