From f4a418b03195e617e0d57a77e59f57e191e1cec5 Mon Sep 17 00:00:00 2001 From: Romanov Alexander Date: Fri, 23 Jan 2015 02:37:04 +1300 Subject: 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 --- source/blender/editors/space_nla/nla_channels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_nla') 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 */ -- cgit v1.2.3