From a0f01ef8d8e7491ee0f5967614d807f8376cfe47 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 1 Nov 2012 15:34:38 +0000 Subject: remove BLI_utildefines from BKE_DerivedMesh.h header --- source/blender/blenkernel/BKE_DerivedMesh.h | 3 --- source/blender/collada/AnimationExporter.h | 17 ++++++++------- source/blender/collada/DocumentExporter.cpp | 33 +++++++++++++++-------------- source/blender/collada/GeometryExporter.cpp | 2 ++ source/blender/collada/SceneExporter.cpp | 6 +++++- source/blender/collada/collada_utils.cpp | 5 +---- source/blender/collada/collada_utils.h | 11 +++++----- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index ecbdb58f44e..c6c54cc6e8a 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -75,9 +75,6 @@ #include "BKE_customdata.h" #include "BKE_bvhutils.h" -/* defines BLI_INLINE */ -#include "BLI_utildefines.h" - struct CCGElem; struct CCGKey; struct MVert; diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 665c6999093..349930dea8f 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -35,10 +35,19 @@ extern "C" #include "DNA_armature_types.h" #include "DNA_material_types.h" +#include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" + #include "BKE_DerivedMesh.h" #include "BKE_fcurve.h" #include "BKE_animsys.h" #include "BKE_scene.h" +#include "BKE_action.h" // pose functions +#include "BKE_armature.h" +#include "BKE_object.h" + #ifdef NAN_BUILDINFO extern char build_rev[]; #endif @@ -46,14 +55,6 @@ extern char build_rev[]; #include "MEM_guardedalloc.h" -#include "BKE_action.h" // pose functions -#include "BKE_armature.h" -#include "BKE_object.h" - -#include "BLI_math.h" -#include "BLI_string.h" -#include "BLI_listbase.h" - #include "RNA_access.h" #include "COLLADASWSource.h" diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index bd7ad16dabd..f21a4f6c557 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -79,31 +79,32 @@ extern "C" #include "DNA_modifier_types.h" #include "DNA_userdef_types.h" -#include "BKE_DerivedMesh.h" -#include "BKE_fcurve.h" -#include "BKE_animsys.h" #include "BLI_path_util.h" #include "BLI_fileops.h" -#include "ED_keyframing.h" -#ifdef WITH_BUILDINFO -extern char build_rev[]; -#endif - -#include "MEM_guardedalloc.h" +#include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" +#include "BKE_action.h" // pose functions +#include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_blender.h" // version info -#include "BKE_scene.h" +#include "BKE_fcurve.h" #include "BKE_global.h" +#include "BKE_image.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_action.h" // pose functions -#include "BKE_armature.h" -#include "BKE_image.h" #include "BKE_object.h" +#include "BKE_scene.h" -#include "BLI_math.h" -#include "BLI_string.h" -#include "BLI_listbase.h" +#include "ED_keyframing.h" +#ifdef WITH_BUILDINFO +extern char build_rev[]; +#endif + +#include "MEM_guardedalloc.h" #include "RNA_access.h" } diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 24ce1ee117d..f33f0fa110d 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -38,6 +38,8 @@ #include "DNA_meshdata_types.h" extern "C" { + #include "BLI_utildefines.h" + #include "BKE_DerivedMesh.h" #include "BKE_main.h" #include "BKE_global.h" diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp index 4aaff024cac..6d239ae0fb1 100644 --- a/source/blender/collada/SceneExporter.cpp +++ b/source/blender/collada/SceneExporter.cpp @@ -24,9 +24,13 @@ * \ingroup collada */ +extern "C" { + #include "BLI_utildefines.h" + #include "BKE_object.h" +} + #include "SceneExporter.h" #include "collada_utils.h" -#include "BKE_object.h" SceneExporter::SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings) : COLLADASW::LibraryVisualScenes(sw), arm_exporter(arm), export_settings(export_settings) diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 018d66c6f55..35844b549de 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -35,7 +35,6 @@ #include "collada_utils.h" extern "C" { - #include "DNA_modifier_types.h" #include "DNA_customdata_types.h" #include "DNA_object_types.h" @@ -44,6 +43,7 @@ extern "C" { #include "DNA_armature_types.h" #include "BLI_math.h" +#include "BLI_linklist.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -51,10 +51,7 @@ extern "C" { #include "BKE_object.h" #include "BKE_mesh.h" #include "BKE_scene.h" - #include "BKE_DerivedMesh.h" -#include "BLI_linklist.h" - #include "WM_api.h" // XXX hrm, see if we can do without this #include "WM_types.h" diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index b52115722fe..b8990c3fcdd 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -35,18 +35,19 @@ #include #include +extern "C" { #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_customdata_types.h" #include "DNA_texture_types.h" -#include "BKE_context.h" -#include "BKE_object.h" - #include "DNA_scene_types.h" -extern "C" { -#include "BKE_DerivedMesh.h" #include "BLI_linklist.h" +#include "BLI_utildefines.h" + +#include "BKE_context.h" +#include "BKE_object.h" +#include "BKE_DerivedMesh.h" } #include "ExportSettings.h" -- cgit v1.2.3