[Bf-blender-cvs] [c31281310cc] temp_D10504_nla_keyframe_remap_upper_strips: - rebase and minor cleanup

Wayde Moss noreply at git.blender.org
Mon Feb 22 22:19:00 CET 2021


Commit: c31281310ccda1536a6837433d4c0758ed93e1d6
Author: Wayde Moss
Date:   Wed Feb 17 01:18:08 2021 -0500
Branches: temp_D10504_nla_keyframe_remap_upper_strips
https://developer.blender.org/rBc31281310ccda1536a6837433d4c0758ed93e1d6

- rebase and minor cleanup

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

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 712429f3a00..43efd75f1a9 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2505,9 +2505,7 @@ void nlasnapshot_enable_all_remap_domain(NlaEvalSnapshot *snapshot)
       continue;
     }
 
-    for (int j = 0; j < necs->length; j++) {
-      BLI_BITMAP_ENABLE(necs->remap_domain.ptr, j);
-    }
+    BLI_bitmap_set_all(necs->remap_domain.ptr, true, necs->length);
   }
 }
 
@@ -2562,7 +2560,6 @@ void nlasnapshot_blend(NlaEvalData *eval_data,
 
     if (upper_blendmode == NLASTRIP_MODE_COMBINE) {
       const int mix_mode = nec->mix_mode;
-
       if (mix_mode == NEC_MIX_QUATERNION) {
         if (!BLI_BITMAP_TEST_BOOL(upper_necs->blend_domain.ptr, 0)) {
           continue;



More information about the Bf-blender-cvs mailing list