[Bf-blender-cvs] [7adc698eedf] master: Cleanup: order BLI before BKE headers
Campbell Barton
noreply at git.blender.org
Tue Nov 14 07:14:50 CET 2017
Commit: 7adc698eedfc325dc8485aa52d56730f87bbb586
Author: Campbell Barton
Date: Tue Nov 14 17:23:40 2017 +1100
Branches: master
https://developer.blender.org/rB7adc698eedfc325dc8485aa52d56730f87bbb586
Cleanup: order BLI before BKE headers
This was done nearly everywhere already
===================================================================
M source/blender/blenkernel/intern/bmfont.c
M source/blender/blenkernel/intern/freestyle.c
M source/blender/blenkernel/intern/outliner_treehash.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/sculpt_paint/paint_curve.c
M source/blender/makesrna/intern/rna_cachefile.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_smoke.c
M source/blender/python/intern/bpy_rna_array.c
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c
index 79b3f89da20..8018629ef2a 100644
--- a/source/blender/blenkernel/intern/bmfont.c
+++ b/source/blender/blenkernel/intern/bmfont.c
@@ -52,11 +52,10 @@
#include "MEM_guardedalloc.h"
#include "IMB_imbuf_types.h"
-#include "BKE_bmfont.h"
-#include "BKE_bmfont_types.h"
-
#include "BLI_utildefines.h"
+#include "BKE_bmfont.h"
+#include "BKE_bmfont_types.h"
#include "BKE_global.h"
void printfGlyph(bmGlyph *glyph)
diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c
index e45a938a4fc..686fe3bda93 100644
--- a/source/blender/blenkernel/intern/freestyle.c
+++ b/source/blender/blenkernel/intern/freestyle.c
@@ -34,14 +34,14 @@
#include "DNA_freestyle_types.h"
#include "DNA_group_types.h"
-#include "BKE_freestyle.h"
-#include "BKE_library.h"
-#include "BKE_linestyle.h"
-
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_string_utils.h"
+#include "BKE_freestyle.h"
+#include "BKE_library.h"
+#include "BKE_linestyle.h"
+
// function declarations
static FreestyleLineSet *alloc_lineset(void);
static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *lineset, const int flag);
diff --git a/source/blender/blenkernel/intern/outliner_treehash.c b/source/blender/blenkernel/intern/outliner_treehash.c
index f31ba34a984..4d97121e2a3 100644
--- a/source/blender/blenkernel/intern/outliner_treehash.c
+++ b/source/blender/blenkernel/intern/outliner_treehash.c
@@ -28,14 +28,14 @@
#include <stdlib.h>
-#include "BKE_outliner_treehash.h"
-
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_mempool.h"
#include "DNA_outliner_types.h"
+#include "BKE_outliner_treehash.h"
+
#include "MEM_guardedalloc.h"
typedef struct TseGroup {
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 25f1e206be5..82f24c91df1 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -34,11 +34,9 @@
#include "MEM_guardedalloc.h"
-#include "BKE_depsgraph.h"
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
-#include "BKE_library.h"
#include "DNA_anim_types.h"
#include "DNA_object_types.h"
@@ -52,11 +50,13 @@
#include "BKE_animsys.h"
#include "BKE_action.h"
+#include "BKE_depsgraph.h"
#include "BKE_fcurve.h"
#include "BKE_gpencil.h"
#include "BKE_context.h"
#include "BKE_mask.h"
#include "BKE_global.h"
+#include "BKE_library.h"
#include "UI_view2d.h"
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c
index 0ee78d61fb8..337f7a1ef2b 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -33,13 +33,13 @@
#include "DNA_space_types.h"
#include "DNA_view3d_types.h"
+#include "BLI_math_vector.h"
+#include "BLI_string.h"
+
#include "BKE_context.h"
#include "BKE_main.h"
#include "BKE_paint.h"
-#include "BLI_math_vector.h"
-#include "BLI_string.h"
-
#include "ED_paint.h"
#include "ED_view3d.h"
diff --git a/source/blender/makesrna/intern/rna_cachefile.c b/source/blender/makesrna/intern/rna_cachefile.c
index 81b0c539e33..73928d377f1 100644
--- a/source/blender/makesrna/intern/rna_cachefile.c
+++ b/source/blender/makesrna/intern/rna_cachefile.c
@@ -34,11 +34,11 @@
#ifdef RNA_RUNTIME
+#include "BLI_string.h"
+
#include "BKE_cachefile.h"
#include "BKE_depsgraph.h"
-#include "BLI_string.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 f4f4685d1bf..c266e0e7f31 100644
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -52,13 +52,13 @@
#ifdef RNA_RUNTIME
+#include "BLI_math.h"
+
#include "DNA_movieclip_types.h"
#include "BKE_depsgraph.h"
#include "BKE_mask.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 28bd0f1b07f..9da27233e0e 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 8e54c708c05..77d7f7833c6 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"
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"
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 631503bdad5..9ad5d73fc55 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -36,7 +36,6 @@
#include "MEM_guardedalloc.h"
-#include "BKE_appdir.h"
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_hash_md5.h"
@@ -45,6 +44,7 @@
#include "BLI_string.h"
#include "BLI_threads.h"
+#include "BKE_appdir.h"
#include "BKE_image.h"
#include "BKE_global.h"
#include "BKE_main.h"
More information about the Bf-blender-cvs
mailing list