[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32743] trunk/blender/source/blender/ blenkernel/intern/anim_sys.c: bugfix [#24418] NLA Crashes blender on Undo

Campbell Barton ideasman42 at gmail.com
Wed Oct 27 18:36:25 CEST 2010


Revision: 32743
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32743
Author:   campbellbarton
Date:     2010-10-27 18:36:25 +0200 (Wed, 27 Oct 2010)

Log Message:
-----------
bugfix [#24418] NLA Crashes blender on Undo

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2010-10-27 16:05:31 UTC (rev 32742)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2010-10-27 16:36:25 UTC (rev 32743)
@@ -1641,6 +1641,11 @@
 			
 			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;
 			}





More information about the Bf-blender-cvs mailing list