Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: NLA, transition to Meta Strip uses wrong time

Browse Source 
Copy correct time to temporary strips used for evaluation of NLA
Transition strips.

When a transition is placed next to a meta strip, the transition would
use the wrong strip time, using the time of the meta strip instead of
its own.

Reviewed by: sybren

Differential Revision: https://developer.blender.org/D8287
This commit is contained in:
Wayde Moss
2020-09-15 12:31:43 +02:00
committed by Sybren A. Stüvel
parent 271f64e358
commit 1555b84f6c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/anim_sys.c
View File

@@ -1921,6 +1921,7 @@ static void nlastrip_evaluate_transition(PointerRNA *ptr,
/* first strip */
tmp_nes.strip_mode = NES_TIME_TRANSITION_START;
tmp_nes.strip = s1;
tmp_nes.strip_time = s1->strip_time;
nlaeval_snapshot_init(&snapshot1, channels, snapshot);
nlastrip_evaluate(
ptr, channels, &tmp_modifiers, &tmp_nes, &snapshot1, anim_eval_context, flush_to_original);
@@ -1928,6 +1929,7 @@ static void nlastrip_evaluate_transition(PointerRNA *ptr,
/* second strip */
tmp_nes.strip_mode = NES_TIME_TRANSITION_END;
tmp_nes.strip = s2;
tmp_nes.strip_time = s2->strip_time;
nlaeval_snapshot_init(&snapshot2, channels, snapshot);
nlastrip_evaluate(
ptr, channels, &tmp_modifiers, &tmp_nes, &snapshot2, anim_eval_context, flush_to_original);