griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Anim: fix null pointer dereference when pushing down an Action

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/128199
This commit is contained in:
Sybren A. Stüvel
2024-09-26 17:29:17 +02:00
parent a9dee36974
commit f7effe8597
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_nla/nla_tracks.cc
View File

@@ -432,7 +432,9 @@ static int nlatracks_pushdown_exec(bContext *C, wmOperator *op)
"Cannot push down actions while tweaking a strip's action, exit tweak mode first");
return OPERATOR_CANCELLED;
}
if (adt->action == nullptr) {
bAction *action_to_push_down = adt->action;
if (!action_to_push_down) {
BKE_report(op->reports, RPT_WARNING, "No active action to push down");
return OPERATOR_CANCELLED;
}
@@ -445,7 +447,7 @@ static int nlatracks_pushdown_exec(bContext *C, wmOperator *op)
/* The action needs updating too, as FCurve modifiers are to be reevaluated. They won't extend
* beyond the NLA strip after pushing down to the NLA. */
DEG_id_tag_update_ex(bmain, &adt->action->id, ID_RECALC_ANIMATION);
DEG_id_tag_update_ex(bmain, &action_to_push_down->id, ID_RECALC_ANIMATION);
/* set notifier that things have changed */
WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, nullptr);