diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/makesrna/intern/rna_nla.c | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index cf84d38a880..304cfb49594 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -20,8 +20,8 @@ #include <stdlib.h> -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BLI_utildefines.h" @@ -39,8 +39,8 @@ #ifdef RNA_RUNTIME -# include <stdio.h> # include <math.h> +# include <stdio.h> /* needed for some of the validation stuff... */ # include "BKE_animsys.h" @@ -51,8 +51,8 @@ # include "ED_anim_api.h" -# include "DEG_depsgraph_build.h" # include "DEG_depsgraph.h" +# include "DEG_depsgraph_build.h" /* temp constant defined for these funcs only... */ # define NLASTRIP_MIN_LEN_THRESH 0.1f |