NLA: use animsys_write_orig_anim_rna when applying NLA stack results.

Without this keyframing on top of an NLA stack is quite weirdly broken.

1 files changed, 10 insertions, 4 deletions

diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index 87f4e37e86d..1c6fd3a3e7d 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -34,6 +34,9 @@
 #define __NLA_PRIVATE_H__
 
 struct Depsgraph;
+struct AnimMapper;
+
+#include "RNA_types.h"
 
 /* --------------- NLA Evaluation DataTypes ----------------------- */
 
@@ -68,9 +71,12 @@ enum eNlaEvalStrip_StripMode {
 typedef struct NlaEvalChannel {
 	struct NlaEvalChannel *next, *prev;
 
-	PointerRNA ptr;         /* pointer to struct containing property to use */
-	PropertyRNA *prop;      /* RNA-property type to use (should be in the struct given) */
-	int index;              /* array index (where applicable) */
+	/* RNA reference to use with pointer and index */
+	PathResolvedRNA rna;
+
+	/* Original parameters used to look up the reference for write_orig_anim_rna */
+	struct AnimMapper *remap;
+	const char *rna_path;
 
 	float value;            /* value of this channel */
 } NlaEvalChannel;
@@ -85,6 +91,6 @@ float nlastrip_get_frame(NlaStrip *strip, float cframe, short mode);
 
 NlaEvalStrip *nlastrips_ctime_get_strip(struct Depsgraph *depsgraph, ListBase *list, ListBase *strips, short index, float ctime);
 void nlastrip_evaluate(struct Depsgraph *depsgraph, PointerRNA *ptr, ListBase *channels, ListBase *modifiers, NlaEvalStrip *nes);
-void nladata_flush_channels(ListBase *channels);
+void nladata_flush_channels(struct Depsgraph *depsgraph, PointerRNA *ptr, ListBase *channels);
 
 #endif  /* __NLA_PRIVATE_H__ */