diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-01-20 12:26:36 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-01-20 12:26:36 +0300 |
| commit | ba965ab32e7dddd7160c60038fa089d5ac318fd7 (patch) | |
| tree | bfaa687272e56490ff84ce17aa3ab24fc844a29e /source/blender/editors/space_nla/nla_edit.c | |
| parent | 09ceb859b7ea9945556ff40799375bd8139234e7 (diff) | |
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
Diffstat (limited to 'source/blender/editors/space_nla/nla_edit.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 921660b0b8b..48ee8e26b94 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -621,8 +621,8 @@ static int nlaedit_duplicate_exec (bContext *C, wmOperator *UNUSED(op)) /* 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 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op) /* 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)) |