[Bf-blender-cvs] [6e138e90d07] master: Fix T80874: Actions inside NLA Strips are not copied to buffer/append

Sybren A. Stüvel noreply at git.blender.org
Thu Sep 24 16:18:51 CEST 2020


Commit: 6e138e90d0771171851ba8961761b050e1eb729c
Author: Sybren A. Stüvel
Date:   Thu Sep 24 16:17:04 2020 +0200
Branches: master
https://developer.blender.org/rB6e138e90d0771171851ba8961761b050e1eb729c

Fix T80874: Actions inside NLA Strips are not copied to buffer/append

Restore NLA Action expansion code that was accidentally removed in
rBbed634c4f96.

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

M	source/blender/blenkernel/intern/anim_data.c

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

diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c
index 6f36b6ee99b..4d815077e91 100644
--- a/source/blender/blenkernel/intern/anim_data.c
+++ b/source/blender/blenkernel/intern/anim_data.c
@@ -1583,4 +1583,7 @@ void BKE_animdata_blend_read_expand(struct BlendExpander *expander, AnimData *ad
 
   /* drivers - assume that these F-Curves have driver data to be in this list... */
   BKE_fcurve_blend_read_expand(expander, &adt->drivers);
+
+  /* NLA data - referenced actions. */
+  BKE_nla_blend_read_expand(expander, &adt->nla_tracks);
 }



More information about the Bf-blender-cvs mailing list