Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2015-03-01 19:04:38 +0300
committerJoshua Leung <aligorith@gmail.com>2015-03-01 19:05:04 +0300
commit2058505da4e52d9fe1920ab11935dfdf99c1edbc (patch)
treebf3cdf05a8b97e1f5f68ad44135f2e5d3c1fa5dd /source/blender/editors/space_action
parentf076eb482b3e2e169b2bbf7ca609f5e747f9709f (diff)
Bugfix T43851: Creating a new action after stashing crashes blender
Diffstat (limited to 'source/blender/editors/space_action')
-rw-r--r--source/blender/editors/space_action/action_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 149956106c5..764e426341a 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -217,8 +217,8 @@ static int action_new_exec(bContext *C, wmOperator *UNUSED(op))
adt = actedit_animdata_from_context(C);
}
- /* Perform stashing operation */
- if (adt) {
+ /* Perform stashing operation - But only if there is an action */
+ if (adt && oldact) {
/* stash the action */
if (BKE_nla_action_stash(adt)) {
/* The stash operation will remove the user already