Commit: 1555b84f6c763c81e908e49f85aa2e1fc6b0261e Author: Wayde Moss Date: Tue Sep 15 12:31:43 2020 +0200 Branches: master https://developer.blender.org/rB1555b84f6c763c81e908e49f85aa2e1fc6b0261e
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 =================================================================== M source/blender/blenkernel/intern/anim_sys.c =================================================================== 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); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
