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

4 files changed, 9 insertions, 7 deletions

diff --git a/source/blender/makesrna/intern/rna_cachefile.c b/source/blender/makesrna/intern/rna_cachefile.c
index 0e59c3784bc..c0aa1f2a9f4 100644
--- a/source/blender/makesrna/intern/rna_cachefile.c
+++ b/source/blender/makesrna/intern/rna_cachefile.c
@@ -34,10 +34,10 @@
 
 #ifdef RNA_RUNTIME
 
-#include "BKE_cachefile.h"
-
 #include "BLI_string.h"
 
+#include "BKE_cachefile.h"
+
 #include "DEG_depsgraph.h"
 
 #include "WM_api.h"
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index 1c7e6fb9587..564232c3dd4 100644
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -52,14 +52,14 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_math.h"
+
 #include "DNA_movieclip_types.h"
 
 #include "BKE_mask.h"
 
 #include "DEG_depsgraph.h"
 
-#include "BLI_math.h"
-
 #include "RNA_access.h"
 
 #include "WM_api.h"
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 0c0cfe24d63..fd2ac7595e2 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -27,6 +27,8 @@
 
 #include <stdlib.h>
 
+#include "BLI_utildefines.h"
+
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
@@ -46,7 +48,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BLI_utildefines.h"
 #include "bmesh.h"
 
 static const EnumPropertyItem particle_edit_hair_brush_items[] = {
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 7c0c5267daf..8c2a09f1186 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -29,6 +29,9 @@
 #include <stdlib.h>
 #include <limits.h>
 
+#include "BLI_sys_types.h"
+#include "BLI_threads.h"
+
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
@@ -38,8 +41,6 @@
 #include "BKE_smoke.h"
 #include "BKE_pointcache.h"
 
-#include "BLI_threads.h"
-
 #include "DNA_modifier_types.h"
 #include "DNA_object_force.h"
 #include "DNA_object_types.h"