Fix NLA action cannot be unlinked in certain cases
The poll for unlinking calls `nla_panel_context` without providing an adt pointer, and there is a check for this pointer in `nla_panel_context` leading to never returning true if it is not provided. (this is fine if there are tracks already, poll would succeed in this case, `nla_panel_context` goes a different code path then) Same call to `nla_panel_context` is also done in the beginning of the corresponding unlink exec function (but this time providing the pointer because it is used later), so it makes sense to do the same thing in the poll function. Equal check is also done in the panel poll function, so now these are all in sync. Part of T87681. Maniphest Tasks: T87681 Differential Revision: https://developer.blender.org/D11041
This commit is contained in:
parent
333c3c92ab
commit
3930b8c69e
Notes:
blender-bot
2023-02-14 10:21:15 +01:00
Referenced by issue #88449, Blender LTS: Maintenance Task 2.93 Referenced by issue #87681, UI bugs in NLA Editor and Action Editor
|
@ -562,7 +562,8 @@ void NLA_OT_action_pushdown(wmOperatorType *ot)
|
|||
static bool nla_action_unlink_poll(bContext *C)
|
||||
{
|
||||
if (ED_operator_nla_active(C)) {
|
||||
return nla_panel_context(C, NULL, NULL, NULL);
|
||||
PointerRNA adt_ptr;
|
||||
return (nla_panel_context(C, &adt_ptr, NULL, NULL) && (adt_ptr.data != NULL));
|
||||
}
|
||||
|
||||
/* something failed... */
|
||||
|
|
Loading…
Reference in New Issue