diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-27 20:36:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-27 20:36:25 +0400 |
| commit | 35807b20be55d49261d5fd2d837b65eb543e5472 (patch) | |
| tree | dfcbc7378e58b80cd46d49bfb6600b8d333e7463 /source | |
| parent | fd3532f1a9598292711412f63ee818329819e478 (diff) | |
bugfix [#24418] NLA Crashes blender on Undo
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index e03799ff938..52c5edc53a0 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1641,6 +1641,11 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime) if ((nlt) && !(adt->flag & ADT_NLA_EDIT_NOMAP)) { /* edit active action in-place according to its active strip, so copy the data */ + + /* this is cleared on undo */ + if(adt->actstrip == NULL) { + adt->actstrip= BKE_nlastrip_find_active(nlt); + } memcpy(&dummy_strip, adt->actstrip, sizeof(NlaStrip)); dummy_strip.next = dummy_strip.prev = NULL; } |