[Bf-blender-cvs] [095a1db2062] temp_D10504_nla_keyframe_remap_upper_strips: minor cleanup

[Wayde Moss]

Commit: 095a1db2062ac9f1d87826f8f68daa85716433f8
Author: Wayde Moss
Date:   Wed Feb 17 00:54:43 2021 -0500
Branches: temp_D10504_nla_keyframe_remap_upper_strips
https://developer.blender.org/rB095a1db2062ac9f1d87826f8f68daa85716433f8

minor cleanup

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

M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/nla_private.h

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index f4e59bc2728..712429f3a00 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2497,13 +2497,6 @@ void nlasnapshot_enable_all_blend_domain(NlaEvalSnapshot *snapshot)
   }
 }
 
-void nlasnapshot_ensure_channels(NlaEvalData *eval_data, NlaEvalSnapshot *snapshot)
-{
-  LISTBASE_FOREACH (NlaEvalChannel *, nec, &eval_data->channels) {
-    nlaeval_snapshot_ensure_channel(snapshot, nec);
-  }
-}
-
 void nlasnapshot_enable_all_remap_domain(NlaEvalSnapshot *snapshot)
 {
   for (int i = 0; i < snapshot->size; i++) {
@@ -2518,6 +2511,13 @@ void nlasnapshot_enable_all_remap_domain(NlaEvalSnapshot *snapshot)
   }
 }
 
+void nlasnapshot_ensure_channels(NlaEvalData *eval_data, NlaEvalSnapshot *snapshot)
+{
+  LISTBASE_FOREACH (NlaEvalChannel *, nec, &eval_data->channels) {
+    nlaeval_snapshot_ensure_channel(snapshot, nec);
+  }
+}
+
 /** Blends the \a lower_snapshot with the \a upper_snapshot into \a r_blended_snapshot according
  * to the given \a upper_blendmode and \a upper_influence.
  *
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index ee7786c5c70..b5d431a0a0d 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -82,8 +82,8 @@ typedef struct NlaEvalChannelSnapshot {
   /** For an upper snapshot channel, marks values that should be blended. */
   NlaValidMask blend_domain;
 
-  /** Only used for keyframe remapping. Any values not in the \a remap_domain should not be used
-   * for keyframing or remapping. */
+  /** Only used for keyframe remapping. Any values not in the \a remap_domain will not be used
+   * for keyframe remapping. */
   NlaValidMask remap_domain;
 
   int length;   /* Number of values in the property. */
@@ -191,10 +191,10 @@ void nladata_flush_channels(PointerRNA *ptr,
 
 void nlasnapshot_enable_all_blend_domain(NlaEvalSnapshot *snapshot);
 
-void nlasnapshot_ensure_channels(NlaEvalData *eval_data, NlaEvalSnapshot *snapshot);
-
 void nlasnapshot_enable_all_remap_domain(NlaEvalSnapshot *snapshot);
 
+void nlasnapshot_ensure_channels(NlaEvalData *eval_data, NlaEvalSnapshot *snapshot);
+
 void nlasnapshot_blend(NlaEvalData *eval_data,
                        NlaEvalSnapshot *lower_snapshot,
                        NlaEvalSnapshot *upper_snapshot,