blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Fix #107625 Making the create action's tooltip different for creation and duplication #118144

Open
Danilo-Ferreira wants to merge 1 commits from Danilo-Ferreira/blender:new-action-tooltip into main
pull from: Danilo-Ferreira/blender:new-action-tooltip
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 1 Files Changed 1 +28 -14
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,21 @@
/** \name Utilities /** \name Utilities
* \{ */ * \{ */
static bool action_active(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);
/* Only when there's an active action, in the right modes... */
if (saction->action && adt) {
return true;
}
}
/* something failed... */
return false;
}
AnimData *ED_actedit_animdata_from_context(const bContext *C, ID **r_adt_id_owner) AnimData *ED_actedit_animdata_from_context(const bContext *C, ID **r_adt_id_owner)
{ {
SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C); SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C);
@ -283,12 +298,22 @@ static int action_new_exec(bContext *C, wmOperator * /*op*/)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
static std::string new_action_get_description(bContext *C, wmOperatorType* /*ot*/, PointerRNA * /*ptr*/)
{
if (action_active(C)) {
return "Creates new action by duplicating the current action";
}
else {
return "Create new action from scratch";
}
}
void ACTION_OT_new(wmOperatorType *ot) void ACTION_OT_new(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name = "New Action"; ot->name = "Duplicate action";
ot->idname = "ACTION_OT_new"; ot->idname = "ACTION_OT_new";
ot->description = "Create new action"; ot->get_description = new_action_get_description;
/* api callbacks */ /* api callbacks */
ot->exec = action_new_exec; ot->exec = action_new_exec;
@ -657,18 +682,7 @@ void ED_animedit_unlink_action(
static bool action_unlink_poll(bContext *C) static bool action_unlink_poll(bContext *C)
{ {
if (ED_operator_action_active(C)) { return action_active(C);
SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C);
AnimData *adt = ED_actedit_animdata_from_context(C, nullptr);
/* Only when there's an active action, in the right modes... */
if (saction->action && adt) {
return true;
}
}
/* something failed... */
return false;
} }
static int action_unlink_exec(bContext *C, wmOperator *op) static int action_unlink_exec(bContext *C, wmOperator *op)