griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix T43851: Creating a new action after stashing crashes blender

Browse Source
This commit is contained in:
Joshua Leung
2015-03-02 05:04:38 +13:00
parent f076eb482b
commit 2058505da4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/nla.c
View File

@@ -1564,6 +1564,12 @@ bool BKE_nla_action_stash(AnimData *adt)
NlaTrack *nlt;
NlaStrip *strip;
/* sanity check */
if (ELEM(NULL, adt, adt->action)) {
printf("%s: Invalid argument - %p %p\n", __func__, adt, adt->action);
return false;
}
/* do not add if it is already stashed */
if (BKE_nla_action_is_stashed(adt, adt->action))
return false;
@@ -1576,6 +1582,7 @@ bool BKE_nla_action_stash(AnimData *adt)
}
nlt = add_nlatrack(adt, prev_track);
BLI_assert(nlt != NULL);
BLI_strncpy(nlt->name, STASH_TRACK_NAME, sizeof(nlt->name));
BLI_uniquename(&adt->nla_tracks, nlt, STASH_TRACK_NAME, '.', offsetof(NlaTrack, name), sizeof(nlt->name));
@@ -1584,6 +1591,7 @@ bool BKE_nla_action_stash(AnimData *adt)
* NOTE: a new user is created here
*/
strip = add_nlastrip(adt->action);
BLI_assert(strip != NULL);
BKE_nlatrack_add_strip(nlt, strip);
BKE_nlastrip_validate_name(adt, strip);

4
source/blender/editors/space_action/action_edit.c
View File

@@ -217,8 +217,8 @@ static int action_new_exec(bContext *C, wmOperator *UNUSED(op))
adt = actedit_animdata_from_context(C);
}
/* Perform stashing operation */
if (adt) {
/* Perform stashing operation - But only if there is an action */
if (adt && oldact) {
/* stash the action */
if (BKE_nla_action_stash(adt)) {
/* The stash operation will remove the user already