From bb69e627106a6e7aa65c3534983aefbf1ac9605c Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 18 Oct 2019 14:14:24 +0200 Subject: [PATCH] Fix T68396: Unable to change any Collision input value after it has been keyframed 'rna_CollisionSettings_update' has a history of tagging ob for update: rB79312c1912b4 ID_RECALC_TRANSFORM |ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION rBf90a2123eedc OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME rBfaf1c9a4bb27 OB_RECALC_ALL rB7df35db1b136 OB_RECALC Since the meaning of OB_RECALC_TIME/ID_RECALC_ANIMATION changed a bit historically (from "please update my animation if the animation datablock is tagged for update" to "update animation of this datablock") this was now always overwriting user edit with animated values, making it impossible to change those values once animated. Thx @sergey for guidance! Maniphest Tasks: T68396 Differential Revision: https://developer.blender.org/D6113 --- source/blender/makesrna/intern/rna_object_force.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 87b14b56504..16d70e21ec2 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -798,7 +798,7 @@ static void rna_CollisionSettings_update(Main *UNUSED(bmain), { Object *ob = (Object *)ptr->owner_id; - DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); + DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob); }