[Bf-blender-cvs] [0352546cdd3] master: NLA: Fix nlasnapshot_blend() Misplaced Null Check

[Wayde Moss]

Commit: 0352546cdd3814770053f80771c3abf20a4bd60b
Author: Wayde Moss
Date:   Wed Feb 3 17:35:21 2021 -0500
Branches: master
https://developer.blender.org/rB0352546cdd3814770053f80771c3abf20a4bd60b

NLA: Fix nlasnapshot_blend() Misplaced Null Check

>From original commit: rB40b7929cc040

===================================================================

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 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) {