diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
| commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
| tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /source/blender/makesrna/intern/rna_nla.c | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 304cfb49594..b0dda1237b0 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -43,7 +43,7 @@ # include <stdio.h> /* needed for some of the validation stuff... */ -# include "BKE_animsys.h" +# include "BKE_anim_data.h" # include "BKE_fcurve.h" # include "BKE_nla.h" @@ -382,7 +382,7 @@ static FCurve *rna_NlaStrip_fcurve_find(NlaStrip *strip, } /* Returns NULL if not found. */ - return list_find_fcurve(&strip->fcurves, data_path, index); + return BKE_fcurve_find(&strip->fcurves, data_path, index); } static NlaStrip *rna_NlaStrip_new(ID *id, |