diff options
author | Wayde Moss <GuiltyGhost> | 2020-09-15 13:31:43 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-09-15 13:47:49 +0300 |
commit | 1555b84f6c763c81e908e49f85aa2e1fc6b0261e (patch) | |
tree | cfa3c71abdf0afa5318fa7832dbf855f0224a4fb /source/blender | |
parent | 271f64e3588b76828e346ab8255e722c981a3d3f (diff) |
Fix: NLA, transition to Meta Strip uses wrong time
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
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 98c01351f32..a348d759e97 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -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); |