[Bf-blender-cvs] [0b2c79e88bd] temp-nla-strip-alignment: - minor update for recent commits on master by others

[Wayde Moss]

Commit: 0b2c79e88bd8de950d051e2e3106abed3d8efdf0
Author: Wayde Moss
Date:   Wed Dec 9 23:35:10 2020 -0500
Branches: temp-nla-strip-alignment
https://developer.blender.org/rB0b2c79e88bd8de950d051e2e3106abed3d8efdf0

- minor update for recent commits on master by others

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

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 7e281c8f47e..894761218e0 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3120,6 +3120,7 @@ void nlastrip_evaluate(PointerRNA *ptr,
        * */
       BKE_constraint_mat_convertspace(object,
                                       pose_channel,
+                                      NULL,
                                       rest_matrix,
                                       CONSTRAINT_SPACE_LOCAL,
                                       CONSTRAINT_SPACE_WORLD,
@@ -4528,10 +4529,10 @@ NlaTrack *BKE_animsys_resample_selected_strips(Main *main,
 
   /************** 3) Allocate resample strip. *************************************** */
 
-  NlaTrack *resample_track = BKE_nlatrack_add(adt, NULL);
+  NlaTrack *resample_track = BKE_nlatrack_add(adt, NULL, false);
   bAction *resample_action = BKE_action_add(main, resample_name);
   NlaStrip *resample_strip = BKE_nlastrip_new(resample_action);
-  BKE_nlatrack_add_strip(resample_track, resample_strip);
+  BKE_nlatrack_add_strip(resample_track, resample_strip, false);
 
   /** REFACTOR: as BKE_nla_track_rename() */
   strcpy(resample_track->name, resample_name);