blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Fix #97628: Clear and Keep Transformation not working when keyed #112670

Merged
Christoph Lendenfeld merged 1 commits from ChrisLend/blender:fix_unparent_with_animation into main 2023-09-21 15:43:16 +02:00
Conversation 0 Commits 1 Files Changed 1 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_relations.cc
View File

@ -391,7 +391,7 @@ void ED_object_parent_clear(Object *ob, const int type)
if (ob->parent == nullptr) {
return;
}
unsigned int flags = ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION;
switch (type) {
case CLEAR_PARENT_ALL: {
/* for deformers, remove corresponding modifiers to prevent
@ -409,6 +409,9 @@ void ED_object_parent_clear(Object *ob, const int type)
* result as object's local transforms */
ob->parent = nullptr;
BKE_object_apply_mat4(ob, ob->object_to_world, true, false);
/* Don't recalculate the animation because it would change the transform
* instead of keeping it. */
flags &= ~ID_RECALC_ANIMATION;
break;
}
case CLEAR_PARENT_INVERSE: {
@ -422,7 +425,7 @@ void ED_object_parent_clear(Object *ob, const int type)
/* Always clear parentinv matrix for sake of consistency, see #41950. */
unit_m4(ob->parentinv);
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
DEG_id_tag_update(&ob->id, flags);
}
/* NOTE: poll should check for editable scene. */