diff options
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 98c01351f32..03c812b3b3d 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1402,7 +1402,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, NlaEvalData *nlaeval, /* accumulate the old and new values of a channel according to mode and influence */ static float nla_blend_value(int blendmode, float old_value, float value, float inf) { - /* optimisation: no need to try applying if there is no influence */ + /* Optimization: no need to try applying if there is no influence. */ if (IS_EQF(inf, 0.0f)) { return old_value; } @@ -1443,7 +1443,7 @@ static float nla_blend_value(int blendmode, float old_value, float value, float static float nla_combine_value( int mix_mode, float base_value, float old_value, float value, float inf) { - /* optimisation: no need to try applying if there is no influence */ + /* Optimization: no need to try applying if there is no influence. */ if (IS_EQF(inf, 0.0f)) { return old_value; } @@ -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); @@ -1955,7 +1957,7 @@ static void nlastrip_evaluate_meta(PointerRNA *ptr, /* meta-strip was calculated normally to have some time to be evaluated at * and here we 'look inside' the meta strip, treating it as a decorated window to - * it's child strips, which get evaluated as if they were some tracks on a strip + * its child strips, which get evaluated as if they were some tracks on a strip * (but with some extra modifiers to apply). * * NOTE: keep this in sync with animsys_evaluate_nla() |