diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2022-08-25 10:25:22 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2022-08-25 10:25:22 +0300 |
| commit | e50c7a244b83fd4f784480f22c3a467b7c50d667 (patch) | |
| tree | efc9fba55d87f1c05d7209e48ec7f2488a51e079 /source/blender/makesrna | |
| parent | 96d8367924efce57e27228082e2a35f9dc903ca4 (diff) | |
| parent | 714a3739da95f867a85c83abe9185d3a0964190a (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 103c77fa808..f15ca63268b 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -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); } |