From 7adc698eedfc325dc8485aa52d56730f87bbb586 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 14 Nov 2017 17:23:40 +1100 Subject: Cleanup: order BLI before BKE headers This was done nearly everywhere already --- source/blender/makesrna/intern/rna_cachefile.c | 4 ++-- source/blender/makesrna/intern/rna_mask.c | 4 ++-- source/blender/makesrna/intern/rna_sculpt_paint.c | 3 ++- source/blender/makesrna/intern/rna_smoke.c | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'source/blender/makesrna') 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 +#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 #include +#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" -- cgit v1.2.3