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:
authorRomanov Alexander <a.romanov@blend4web.com>2015-01-22 16:37:04 +0300
committerJoshua Leung <aligorith@gmail.com>2015-01-25 08:55:05 +0300
commitf4a418b03195e617e0d57a77e59f57e191e1cec5 (patch)
tree9505e2a4034559eb7eb1f489012adef9dec2b510 /source/blender/editors/space_nla
parentb112ea3d7615db66643835850c5d7f7d38caf768 (diff)
Crash when deleting NlaTrack
Steps to reproduce: 1) Create an object, animated with shape keys 2) Copy it with Alt-D 3) Push action down to nla track 4) Select that track and delete it In attached file 1-3 steps are completed. {F138559} Alexander (Blend4Web Team) Reviewers: aligorith Subscribers: yurikovelenov, Evgeny_Rodygin, valentin_b4w, AlexKowel Differential Revision: https://developer.blender.org/D1015
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r--source/blender/editors/space_nla/nla_channels.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index 0abe5e42c3e..5476d1c2683 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -650,7 +650,7 @@ static int nlaedit_delete_tracks_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_CANCELLED;
/* get a list of the AnimData blocks being shown in the NLA */
- filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL);
+ filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_NODUPLIS);
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
/* delete tracks */