diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-02-28 02:57:17 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-02-28 16:34:50 +0300 |
commit | 13a0dce51c949e09842876da1c4dc68c047d6ed0 (patch) | |
tree | 6457defc461d73311615b3d98965721dcc4dbe01 /source/blender/editors | |
parent | b16fbabd616944007e4730640dd55db5fa021afa (diff) |
Action Stashing: Don't allow an action to get stashed more than once
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_action/action_edit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index c4ed44c91f5..ba06c7cf0e2 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -327,6 +327,11 @@ static int action_stash_exec(bContext *C, wmOperator *op) saction->action = NULL; actedit_change_action(C, new_action); } + else { + /* action has already been added - simply warn about this, and clear */ + BKE_report(op->reports, RPT_ERROR, "Action has already been stashed"); + actedit_change_action(C, NULL); + } } } |