Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-09-24 17:17:04 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-09-24 17:17:30 +0300
commit6e138e90d0771171851ba8961761b050e1eb729c (patch)
tree5e4e707b35ee0a1998894318718dea73e6e81bd5 /source/blender/blenkernel/intern/anim_data.c
parent538d9bb41d7fdaa50761f0807b6ebafd6c865723 (diff)
Fix T80874: Actions inside NLA Strips are not copied to buffer/append
Restore NLA Action expansion code that was accidentally removed in rBbed634c4f96.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_data.c')
-rw-r--r--source/blender/blenkernel/intern/anim_data.c3
1 files changed, 3 insertions, 0 deletions
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);
}