diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 20:00:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 22:58:54 +0300 |
commit | 64ec05b64d106623f63dd308d0950866a22b6229 (patch) | |
tree | ac7613e56ac5bc4ad1ac3d8b03657b48b11d8bc2 /source/blender/collada | |
parent | 1ff8be24ef8970f140865dfb118112ec08e7dfad (diff) |
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).
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/ArmatureExporter.cpp | 4 | ||||
-rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 9 | ||||
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/ImageExporter.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 1 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 5 |
7 files changed, 12 insertions, 18 deletions
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp index a77385c8d00..45628054ad2 100644 --- a/source/blender/collada/ArmatureExporter.cpp +++ b/source/blender/collada/ArmatureExporter.cpp @@ -39,10 +39,8 @@ #include "BKE_armature.h" extern "C" { -#include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_global.h" -#include "BKE_library.h" +#include "BKE_mesh.h" } #include "ED_armature.h" diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 84812451c05..862ce306409 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -38,11 +38,10 @@ #include "BKE_armature.h" extern "C" { -#include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_idprop.h" +#include "BKE_library.h" +#include "BKE_mesh.h" } #include "ED_armature.h" diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index eea51d1560f..50a9e351bc6 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -58,15 +58,14 @@ extern "C" { #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_main.h" +#include "BKE_fcurve.h" +#include "BKE_global.h" +#include "BKE_image.h" #include "BKE_layer.h" #include "BKE_lamp.h" #include "BKE_library.h" -#include "BKE_fcurve.h" -#include "BKE_scene.h" -#include "BKE_global.h" #include "BKE_material.h" -#include "BKE_image.h" +#include "BKE_scene.h" #include "BLI_path_util.h" diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index b155160697b..928509cbef9 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -40,10 +40,9 @@ extern "C" { #include "BLI_utildefines.h" - #include "BKE_main.h" + #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_library.h" - #include "BKE_customdata.h" #include "BKE_material.h" #include "BKE_mesh.h" } diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index 23e67733e9c..c2666f591b5 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -37,12 +37,13 @@ extern "C" { #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" + #include "BLI_fileops.h" #include "BLI_path_util.h" #include "BLI_string.h" + #include "IMB_imbuf_types.h" } diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 4c0c13db72c..5aac5a09118 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -43,7 +43,6 @@ extern "C" { #include "BKE_displist.h" #include "BKE_global.h" #include "BKE_library.h" - #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_object.h" diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index a70ff3a7c8f..5f01a092699 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -47,13 +47,12 @@ extern "C" { #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_object.h" #include "BKE_global.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_layer.h" +#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_object.h" #include "BKE_scene.h" #include "ED_armature.h" |