[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34416] trunk/blender/source/blender/ editors/space_nla/nla_edit.c: NLA Tool Bugfixes:

[Joshua Leung]

Revision: 34416
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34416
Author:   aligorith
Date:     2011-01-20 09:26:36 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
NLA Tool Bugfixes:
- Swap strips operator crashed when it encountered an empty track
- Duplicating NLA strips was renaming the wrong strips - the old ones
would always get renamed, which was annoying

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_nla/nla_edit.c

Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c	2011-01-20 08:20:47 UTC (rev 34415)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c	2011-01-20 09:26:36 UTC (rev 34416)
@@ -621,8 +621,8 @@
 				/* deselect the original and the active flag */
 				strip->flag &= ~(NLASTRIP_FLAG_SELECT|NLASTRIP_FLAG_ACTIVE);
 				
-				/* auto-name it */
-				BKE_nlastrip_validate_name(adt, strip);
+				/* auto-name newly created strip */
+				BKE_nlastrip_validate_name(adt, nstrip);
 				
 				done++;
 			}
@@ -1038,7 +1038,7 @@
 		/* special case: if there is only 1 island (i.e. temp meta BUT NOT unselected/normal/normal-meta strips) left after this, 
 		 * and this island has two strips inside it, then we should be able to just swap these still...
 		 */
-		if (nlt->strips.first == nlt->strips.last) {
+		if ((nlt->strips.first == nlt->strips.last) && (nlt->strips.first != NULL)) {
 			NlaStrip *mstrip = (NlaStrip *)nlt->strips.first;
 			
 			if ((mstrip->flag & NLASTRIP_FLAG_TEMP_META) && (BLI_countlist(&mstrip->strips) == 2))