archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T58117: Crash with keyframing, take two

Browse Source 
More operators need to become aware of action possibly being gone.
This commit is contained in:
Sergey Sharybin
2018-12-04 12:11:25 +01:00
parent b97cd0e690
commit e6141d7b3b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/animation/keyframing.c
View File

@@ -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 */