diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-15 12:46:19 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-15 12:46:19 +0300 |
commit | 2a7f8d3cb332055f026cd09933136d6981b585e7 (patch) | |
tree | ae93233578e32570c1f5d47f83dd0b81a9bfefb9 /source/blender/python | |
parent | 44517c5f2177d1f260ba691fb59fbacfef576915 (diff) | |
parent | 556b13f03e561b54d4f0186e207f080c786f8b66 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_rna_array.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c index 3e147d29c90..e0ca3634261 100644 --- a/source/blender/python/intern/bpy_rna_array.c +++ b/source/blender/python/intern/bpy_rna_array.c @@ -28,13 +28,14 @@ #include <Python.h> +#include "BLI_utildefines.h" + #include "RNA_types.h" #include "bpy_rna.h" #include "BKE_global.h" -#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "MEM_guardedalloc.h" #include "RNA_access.h" |