[Bf-blender-cvs] [3a203f420f3] temp_D10504_nla_keyframe_remap_upper_strips: - Overlooked remap_domain writing, now sets remap_domain on output even when succeeds. This didn't have any effect for user as the input blended_snapshot and output upper_snapshot were always the same.

[Wayde Moss]

Commit: 3a203f420f3f47a180295f8a2a3dffaf436c3c2d
Author: Wayde Moss
Date:   Wed Feb 17 16:16:06 2021 -0500
Branches: temp_D10504_nla_keyframe_remap_upper_strips
https://developer.blender.org/rB3a203f420f3f47a180295f8a2a3dffaf436c3c2d

- Overlooked remap_domain writing, now sets remap_domain on output even when succeeds. This didn't have any effect for user as the input blended_snapshot and output upper_snapshot were always the same.

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

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 43efd75f1a9..a5626d8c22d 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2644,10 +2644,9 @@ void nlasnapshot_blend_get_inverted_upper_snapshot(NlaEvalData *eval_data,
           continue;
         }
 
-        if (!nla_combine_quaternion_get_inverted_strip_values(
-                lower_necs->values, blended_necs->values, upper_influence, result_necs->values)) {
-          BLI_bitmap_set_all(result_necs->remap_domain.ptr, false, 4);
-        }
+        const bool success = nla_combine_quaternion_get_inverted_strip_values(
+            lower_necs->values, blended_necs->values, upper_influence, result_necs->values);
+        BLI_bitmap_set_all(result_necs->remap_domain.ptr, success, 4);
       }
       else {
         BLI_assert(ELEM(mix_mode, NEC_MIX_ADD, NEC_MIX_AXIS_ANGLE, NEC_MIX_MULTIPLY));
@@ -2658,15 +2657,13 @@ void nlasnapshot_blend_get_inverted_upper_snapshot(NlaEvalData *eval_data,
             continue;
           }
 
-          if (!nla_combine_get_inverted_strip_value(mix_mode,
-                                                    nec->base_snapshot.values[j],
-                                                    lower_necs->values[j],
-                                                    blended_necs->values[j],
-                                                    upper_influence,
-                                                    &result_necs->values[j])) {
-
-            BLI_BITMAP_DISABLE(result_necs->remap_domain.ptr, j);
-          }
+          const bool success = nla_combine_get_inverted_strip_value(mix_mode,
+                                                                    nec->base_snapshot.values[j],
+                                                                    lower_necs->values[j],
+                                                                    blended_necs->values[j],
+                                                                    upper_influence,
+                                                                    &result_necs->values[j]);
+          BLI_BITMAP_SET(result_necs->remap_domain.ptr, j, success);
         }
       }
     }
@@ -2683,14 +2680,12 @@ void nlasnapshot_blend_get_inverted_upper_snapshot(NlaEvalData *eval_data,
           continue;
         }
 
-        if (!nla_blend_get_inverted_strip_value(upper_blendmode,
-                                                lower_necs->values[j],
-                                                blended_necs->values[j],
-                                                upper_influence,
-                                                &result_necs->values[j])) {
-
-          BLI_BITMAP_DISABLE(result_necs->remap_domain.ptr, j);
-        }
+        const bool success = nla_blend_get_inverted_strip_value(upper_blendmode,
+                                                                lower_necs->values[j],
+                                                                blended_necs->values[j],
+                                                                upper_influence,
+                                                                &result_necs->values[j]);
+        BLI_BITMAP_SET(result_necs->remap_domain.ptr, j, success);
       }
     }
   }