diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-01-12 13:30:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-01-12 13:32:17 +0300 |
| commit | 89ae4a7a2a9a067dd425d9ae5c63aabcc60a986e (patch) | |
| tree | b4fa85da3916f14aa7a7c8729a267bd1a3c02d5a /source/blender/editors | |
| parent | 401279253ea6109cec9ccfd1d94ba0ab9fdbf7bc (diff) | |
Fix NLA liboverride issues re tracks handling.
From original rBc0bd240ad0a1 commit, issues reported with suggested
fixes by Wayde Moss (@GuiltyGhost), thx.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform_convert_nla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c index fa60a88a45b..ada668bcd04 100644 --- a/source/blender/editors/transform/transform_convert_nla.c +++ b/source/blender/editors/transform/transform_convert_nla.c @@ -484,7 +484,7 @@ void recalcData_nla(TransInfo *t) for (track = tdn->nlt->next, n = 0; (track) && (n < delta); track = track->next, n++) { /* check if space in this track for the strip */ if (BKE_nlatrack_has_space(track, strip->start, strip->end) && - !BKE_nlatrack_is_nonlocal_in_liboverride(tdn->id, tdn->nlt)) { + !BKE_nlatrack_is_nonlocal_in_liboverride(tdn->id, track)) { /* move strip to this track */ BLI_remlink(&tdn->nlt->strips, strip); BKE_nlatrack_add_strip(track, strip, is_liboverride); @@ -504,7 +504,7 @@ void recalcData_nla(TransInfo *t) for (track = tdn->nlt->prev, n = 0; (track) && (n < delta); track = track->prev, n++) { /* check if space in this track for the strip */ if (BKE_nlatrack_has_space(track, strip->start, strip->end) && - !BKE_nlatrack_is_nonlocal_in_liboverride(tdn->id, tdn->nlt)) { + !BKE_nlatrack_is_nonlocal_in_liboverride(tdn->id, track)) { /* move strip to this track */ BLI_remlink(&tdn->nlt->strips, strip); BKE_nlatrack_add_strip(track, strip, is_liboverride); |