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

Refactor: Anim, simplify action_pushdown_poll()

Browse Source 
Simplify `action_pushdown_poll()` by flipping conditions & returning early.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2024-06-19 17:38:14 +02:00
parent 7326320e81
commit b9283baf4e
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/space_action/action_data.cc
View File

@@ -300,23 +300,21 @@ void ACTION_OT_new(wmOperatorType *ot)
static bool action_pushdown_poll(bContext *C)
{
if (ED_operator_action_active(C)) {
SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C);
AnimData *adt = ED_actedit_animdata_from_context(C, nullptr);
/* Check for AnimData, Actions, and that tweak-mode is off. */
if (adt && saction->action) {
/* NOTE: We check this for the AnimData block in question and not the global flag,
* as the global flag may be left dirty by some of the browsing ops here.
*/
if (!(adt->flag & ADT_NLA_EDIT_ON)) {
return true;
}
}
if (!ED_operator_action_active(C)) {
return false;
}
/* something failed... */
return false;
SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C);
AnimData *adt = ED_actedit_animdata_from_context(C, nullptr);
if (!adt || !saction->action) {
return false;
}
/* NOTE: We check this for the AnimData block in question and not the global flag,
* as the global flag may be left dirty by some of the browsing ops here.
*/
return (adt->flag & ADT_NLA_EDIT_ON) == 0;
}
static int action_pushdown_exec(bContext *C, wmOperator *op)