Fix T58117: Crash with keyframing, take two

More operators need to become aware of action possibly being gone.

diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 9faa7a8e8cde0aaae0c2490163ebe51870f738c5..254569a345a8c38f483f7a1d473c89733dae4367 100644 (file)
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1302,7 +1302,13 @@ short delete_keyframe(Main *bmain, ReportList *reports, ID *id, bAction *act,
                ret += delete_keyframe_fcurve(adt, fcu, cfra);
 
        }
-
+       /* In the case last f-curve wes removed need to inform dependency graph
+        * about relations update, since it needs to get rid of animation operation
+        * for this datablock. */
+       if (ret && adt->action == NULL) {
+               DEG_id_tag_update_ex(bmain, id, DEG_TAG_COPY_ON_WRITE);
+               DEG_relations_tag_update(bmain);
+       }
        /* return success/failure */
        return ret;
 }
@@ -1395,7 +1401,8 @@ static short clear_keyframe(Main *bmain, ReportList *reports, ID *id, bAction *a
        /* In the case last f-curve wes removed need to inform dependency graph
         * about relations update, since it needs to get rid of animation operation
         * for this datablock. */
-       if (adt->action == NULL) {
+       if (ret && adt->action == NULL) {
+               DEG_id_tag_update_ex(bmain, id, DEG_TAG_COPY_ON_WRITE);
                DEG_relations_tag_update(bmain);
        }
        /* return success/failure */