From 0352546cdd3814770053f80771c3abf20a4bd60b Mon Sep 17 00:00:00 2001 From: Wayde Moss Date: Wed, 3 Feb 2021 17:35:21 -0500 Subject: NLA: Fix nlasnapshot_blend() Misplaced Null Check From original commit: rB40b7929cc040 --- source/blender/blenkernel/intern/anim_sys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 646996bcaa8..923a77618aa 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2532,6 +2532,11 @@ void nlasnapshot_blend(NlaEvalData *eval_data, continue; } + /** Blend with lower_snapshot's base or default. */ + if (lower_necs == NULL) { + lower_necs = nlaeval_snapshot_find_channel(lower_snapshot->base, nec); + } + NlaEvalChannelSnapshot *result_necs = nlaeval_snapshot_ensure_channel(r_blended_snapshot, nec); if (upper_necs == NULL || zero_upper_influence) { @@ -2539,11 +2544,6 @@ void nlasnapshot_blend(NlaEvalData *eval_data, continue; } - /** Blend with lower_snapshot's base or default. */ - if (lower_necs == NULL) { - lower_necs = nlaeval_snapshot_find_channel(lower_snapshot->base, nec); - } - if (upper_blendmode == NLASTRIP_MODE_COMBINE) { const int mix_mode = nec->mix_mode; if (mix_mode == NEC_MIX_QUATERNION) { -- cgit v1.2.3