[Bf-blender-cvs] [48fe6f73cd0] temp-sybren-alembic: Cleanup: removed unused #include statements from Alembic code

Sybren A. Stüvel noreply at git.blender.org
Fri Jan 31 15:05:24 CET 2020


Commit: 48fe6f73cd09a38268af44233e5519435b8b2525
Author: Sybren A. Stüvel
Date:   Fri Jan 31 15:04:22 2020 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rB48fe6f73cd09a38268af44233e5519435b8b2525

Cleanup: removed unused #include statements from Alembic code

No functional changes.

===================================================================

M	source/blender/alembic/intern/abc_customdata.cc
M	source/blender/alembic/intern/abc_reader_archive.cc
M	source/blender/alembic/intern/abc_reader_camera.cc
M	source/blender/alembic/intern/abc_reader_curves.cc
M	source/blender/alembic/intern/abc_reader_mesh.cc
M	source/blender/alembic/intern/abc_reader_nurbs.cc
M	source/blender/alembic/intern/abc_reader_object.cc
M	source/blender/alembic/intern/abc_reader_points.cc
M	source/blender/alembic/intern/abc_reader_transform.cc
M	source/blender/alembic/intern/abc_util.cc
M	source/blender/alembic/intern/abc_writer_archive.cc
M	source/blender/alembic/intern/abc_writer_camera.cc
M	source/blender/alembic/intern/abc_writer_curves.cc
M	source/blender/alembic/intern/abc_writer_hair.cc
M	source/blender/alembic/intern/abc_writer_mball.cc
M	source/blender/alembic/intern/abc_writer_mesh.cc
M	source/blender/alembic/intern/abc_writer_nurbs.cc
M	source/blender/alembic/intern/abc_writer_object.cc
M	source/blender/alembic/intern/abc_writer_points.cc
M	source/blender/alembic/intern/abc_writer_transform.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc
index 7f04bb77052..c5f60ac3e29 100644
--- a/source/blender/alembic/intern/abc_customdata.cc
+++ b/source/blender/alembic/intern/abc_customdata.cc
@@ -32,6 +32,8 @@ extern "C" {
 #include "DNA_meshdata_types.h"
 
 #include "BLI_math_base.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_customdata.h"
 }
 
diff --git a/source/blender/alembic/intern/abc_reader_archive.cc b/source/blender/alembic/intern/abc_reader_archive.cc
index 69c50c5e56d..6ad44553701 100644
--- a/source/blender/alembic/intern/abc_reader_archive.cc
+++ b/source/blender/alembic/intern/abc_reader_archive.cc
@@ -24,13 +24,10 @@
 #include "abc_reader_archive.h"
 
 extern "C" {
-#include "BKE_blender_version.h"
 #include "BKE_main.h"
 
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-
-#include "DNA_scene_types.h"
 }
 
 #ifdef WIN32
diff --git a/source/blender/alembic/intern/abc_reader_camera.cc b/source/blender/alembic/intern/abc_reader_camera.cc
index c5f752cdf9a..ab506f32cbe 100644
--- a/source/blender/alembic/intern/abc_reader_camera.cc
+++ b/source/blender/alembic/intern/abc_reader_camera.cc
@@ -19,7 +19,6 @@
  */
 
 #include "abc_reader_camera.h"
-
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
@@ -31,7 +30,6 @@ extern "C" {
 #include "BKE_object.h"
 
 #include "BLI_math.h"
-#include "BLI_string.h"
 }
 
 using Alembic::AbcGeom::CameraSample;
diff --git a/source/blender/alembic/intern/abc_reader_curves.cc b/source/blender/alembic/intern/abc_reader_curves.cc
index 3a52a5a1d72..1be164c7c94 100644
--- a/source/blender/alembic/intern/abc_reader_curves.cc
+++ b/source/blender/alembic/intern/abc_reader_curves.cc
@@ -22,12 +22,11 @@
  */
 
 #include "abc_reader_curves.h"
-
-#include <cstdio>
-
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
+#include <cstdio>
+
 #include "MEM_guardedalloc.h"
 
 extern "C" {
@@ -39,8 +38,6 @@ extern "C" {
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-
-#include "ED_curve.h"
 }
 
 using Alembic::Abc::FloatArraySamplePtr;
diff --git a/source/blender/alembic/intern/abc_reader_mesh.cc b/source/blender/alembic/intern/abc_reader_mesh.cc
index 3e002c91a98..bca1a32d3e3 100644
--- a/source/blender/alembic/intern/abc_reader_mesh.cc
+++ b/source/blender/alembic/intern/abc_reader_mesh.cc
@@ -19,44 +19,26 @@
  */
 
 #include "abc_reader_mesh.h"
-
-#include <algorithm>
-
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
+#include <algorithm>
+
 #include "MEM_guardedalloc.h"
 
 extern "C" {
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_fluidsim_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_math_geom.h"
-#include "BLI_string.h"
 
-#include "BKE_animsys.h"
-#include "BKE_key.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
-#include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "ED_mesh.h"
-
-#include "bmesh.h"
-#include "bmesh_tools.h"
-
-#include "DEG_depsgraph_query.h"
 }
 
 using Alembic::Abc::Int32ArraySamplePtr;
diff --git a/source/blender/alembic/intern/abc_reader_nurbs.cc b/source/blender/alembic/intern/abc_reader_nurbs.cc
index 8ce67f8b862..0ada10baba5 100644
--- a/source/blender/alembic/intern/abc_reader_nurbs.cc
+++ b/source/blender/alembic/intern/abc_reader_nurbs.cc
@@ -19,7 +19,6 @@
  */
 
 #include "abc_reader_nurbs.h"
-
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
@@ -30,7 +29,6 @@ extern "C" {
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
-#include "BLI_math.h"
 #include "BLI_string.h"
 
 #include "BKE_curve.h"
diff --git a/source/blender/alembic/intern/abc_reader_object.cc b/source/blender/alembic/intern/abc_reader_object.cc
index 77189583cc7..fa48db79d73 100644
--- a/source/blender/alembic/intern/abc_reader_object.cc
+++ b/source/blender/alembic/intern/abc_reader_object.cc
@@ -19,24 +19,22 @@
  */
 
 #include "abc_reader_object.h"
-
 #include "abc_util.h"
 
 extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
 #include "DNA_space_types.h" /* for FILE_MAX */
 
 #include "BKE_constraint.h"
-#include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
 #include "BLI_string.h"
 }
 
diff --git a/source/blender/alembic/intern/abc_reader_points.cc b/source/blender/alembic/intern/abc_reader_points.cc
index 85ac3262967..e4dc345f868 100644
--- a/source/blender/alembic/intern/abc_reader_points.cc
+++ b/source/blender/alembic/intern/abc_reader_points.cc
@@ -22,7 +22,6 @@
  */
 
 #include "abc_reader_points.h"
-
 #include "abc_reader_mesh.h"
 #include "abc_reader_transform.h"
 #include "abc_util.h"
@@ -31,16 +30,9 @@ extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_cdderivedmesh.h"
-#include "BKE_lattice.h"
+#include "BKE_customdata.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
-#include "BKE_scene.h"
-
-#include "BLI_math.h"
-
-#include "DEG_depsgraph_query.h"
 }
 
 using Alembic::AbcGeom::kWrapExisting;
diff --git a/source/blender/alembic/intern/abc_reader_transform.cc b/source/blender/alembic/intern/abc_reader_transform.cc
index eb7062b301a..ce569a9ccb5 100644
--- a/source/blender/alembic/intern/abc_reader_transform.cc
+++ b/source/blender/alembic/intern/abc_reader_transform.cc
@@ -19,21 +19,14 @@
  */
 
 #include "abc_reader_transform.h"
-
-#include <OpenEXR/ImathBoxAlgo.h>
-
 #include "abc_util.h"
 
 extern "C" {
 #include "DNA_object_types.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_utildefines.h"
 
-#include "BKE_animsys.h"
 #include "BKE_object.h"
-
-#include "DEG_depsgraph_query.h"
 }
 
 using Alembic::Abc::ISampleSelector;
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 6a2542bfd49..394232003ee 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -33,9 +33,8 @@
 
 extern "C" {
 #include "DNA_object_types.h"
-#include "DNA_layer_types.h"
 
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
 
 #include "PIL_time.h"
 }
diff --git a/source/blender/alembic/intern/abc_writer_archive.cc b/source/blender/alembic/intern/abc_writer_archive.cc
index 199d8136760..af18d480a18 100644
--- a/source/blender/alembic/intern/abc_writer_archive.cc
+++ b/source/blender/alembic/intern/abc_writer_archive.cc
@@ -24,7 +24,6 @@
 #include "abc_writer_archive.h"
 extern "C" {
 #include "BKE_blender_version.h"
-#include "BKE_main.h"
 
 #include "BLI_path_util.h"
 #include "BLI_string.h"
diff --git a/source/blender/alembic/intern/abc_writer_camera.cc b/source/blender/alembic/intern/abc_writer_camera.cc
index 04a4b1eb180..e705e5ba911 100644
--- a/source/blender/alembic/intern/abc_writer_camera.cc
+++ b/source/blender/alembic/intern/abc_writer_camera.cc
@@ -19,19 +19,11 @@
  */
 
 #include "abc_writer_camera.h"
-
 #include "abc_writer_transform.h"
-#include "abc_util.h"
 
 extern "C" {
 #include "DNA_camera_types.h"
 #include "DNA_object_types.h"
-
-#include "BKE_camera.h"
-#include "BKE_object.h"
-
-#include "BLI_math.h"
-#include "BLI_string.h"
 }
 
 using Alembic::AbcGeom::OCamera;
diff --git a/source/blender/alembic/intern/abc_writer_curves.cc b/source/blender/alembic/intern/abc_writer_curves.cc
index 046c7e08e2e..bb9109dc025 100644
--- a/source/blender/alembic/intern/abc_writer_curves.cc
+++ b/source/blender/alembic/intern/abc_writer_curves.cc
@@ -22,26 +22,15 @@
  */
 
 #include "abc_writer_curves.h"
-
-#include <cstdio>
-
 #include "abc_reader_curves.h"
 #include "abc_writer_transform.h"
-#include "abc_util.h"
-
-#include "MEM_guardedalloc.h"
 
 extern "C" {
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_listbase.h"
-
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
-#include "BKE_object.h"
-
-#include "ED_curve.h"
 }
 
 using Alembic::AbcGeom::OCompoundProperty;
diff --git a/source/blender/alembic/intern/abc_writer_hair.cc b/source/blender/alembic/intern/abc_writer_hair.cc
index 42448742743..bbba03ed7f4 100644
--- a/source/blender/alembic/intern/abc_writer_hair.cc
+++ b/source/blender/alembic/intern/abc_writer_hair.cc
@@ -19,25 +19,21 @@
  */
 
 #include "abc_writer_hair.h"
-
-#include <cstdio>
-
 #include "abc_writer_transform.h"
 #include "abc_util.h"
 
-#include "MEM_guardedalloc.h"
+#include <cstdio>
 
 extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
 
-#include "BLI_listbase.h"
 #include "BLI_math_geom.h"
 
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
-#include "BKE_object.h"
 #include "BKE_particle.h"
 }
 
diff --git a/source/blender/alembic/intern/abc_writer_mball.cc b/source/blender/alembic/intern/abc_writer_mball.cc
index 24734d70d2f..9e772893be0 100644
--- a/source/blender/alembic/intern/abc_writer_mball.cc
+++ b/source/blender/alembic/intern/abc_writer_mball.cc
@@ -20,23 +20,18 @@
 
 #include "abc_writer_mball.h"
 #include "abc_writer_mesh.h"
-#include "abc_writer_transform.h"
-
-#include "MEM_guardedalloc.h"
 
 extern "C" {
 #include "DNA_meta_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_curve.h"
 #include "BKE_displist.h"
 #include "BKE_library.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
-#include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "BLI_utildefines.h"
 }
 
 AbcMBallWriter::AbcMBallWriter(Main *bmain,
diff --git a/source/blender/alembic/intern/abc_writer_mesh.cc b/source/blender/alembic/intern/abc_writer_mesh.cc
index 153982793a7..fd24b94764d 100644
--- a/source/blender/alembic/intern/abc_writer_mesh.cc
+++ b/source/blender/alembic/intern/abc_writer_mesh.cc
@@ -19,39 +19,22 @@
  */
 
 #include "abc_writer_mesh.h"
-
-#include <algorithm>
-
 #include "abc_writer_transform.h"
 #inc

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list