diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-11-05 03:09:45 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-11-05 03:09:45 +0300 |
| commit | 52865a51408fba9c871caff82ca0acb71a37d2d7 (patch) | |
| tree | 8b2902cd0f9405d7990e44ab11cbde19611c59c3 /source/blender/blenkernel | |
| parent | 8bbf27dfbd8c3831541653f14de4e8b0bdf83259 (diff) | |
Bugfix #24535: File saved with NLA Strip in Tweakmode crashes on reload
Now the active strip doesn't just get cleared on fileload, but is relinked properly.
I had originally intended that files shouldn't be able to be saved with NLA data still in Tweakmode, but this turns out to be a bit more troublesome to get working as that would make undo keep popping out of this mode too.
Also reverting 32743 (bugfix for 24418), which was a hack around this.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 52c5edc53a0..e03799ff938 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1641,11 +1641,6 @@ 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; } |