From 64ec05b64d106623f63dd308d0950866a22b6229 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Nov 2018 18:00:24 +0100 Subject: Cleanup: remove some useless BKE_library and BKE_main includes. Makes it simpler to make some changes... Also fix order of some includes (use alphabetical please). --- source/blender/editors/gpencil/gpencil_brush.c | 7 +++---- source/blender/editors/gpencil/gpencil_convert.c | 1 - source/blender/editors/gpencil/gpencil_data.c | 6 +++--- source/blender/editors/gpencil/gpencil_edit.c | 6 +++--- source/blender/editors/gpencil/gpencil_interpolate.c | 3 +-- source/blender/editors/gpencil/gpencil_primitive.c | 3 +-- 6 files changed, 11 insertions(+), 15 deletions(-) (limited to 'source/blender/editors/gpencil') diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index c83bf8b7a5c..ba104a6d57e 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -56,15 +56,14 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" -#include "BKE_library.h" +#include "BKE_material.h" +#include "BKE_object_deform.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_object_deform.h" -#include "BKE_colortools.h" -#include "BKE_material.h" #include "UI_interface.h" diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index e6246bb8fd4..9ec2915b60c 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -64,7 +64,6 @@ #include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 40cff866ffe..23d12b99729 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -57,9 +57,8 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_main.h" -#include "BKE_brush.h" #include "BKE_animsys.h" +#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_fcurve.h" @@ -67,9 +66,10 @@ #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_library.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_material.h" #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 1d29761bb74..7e81e375abd 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -55,15 +55,15 @@ #include "DNA_view3d_types.h" #include "DNA_gpencil_types.h" -#include "BKE_main.h" +#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_brush.h" #include "BKE_gpencil.h" -#include "BKE_paint.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 1b7acbd4132..ae1d1454eae 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -56,12 +56,11 @@ #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_library.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_deform.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 5f50c2f7a82..0e15e9f0a4e 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -53,13 +53,12 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_main.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_library.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_report.h" -- cgit v1.2.3