[Bf-blender-cvs] [fc0025b5163] usd-importer-T81257-merge: USD importer: includes cleanup.
makowalski
noreply at git.blender.org
Mon Jul 19 06:27:36 CEST 2021
Commit: fc0025b516359a7ce933ac23c547171e7404f629
Author: makowalski
Date: Mon Jul 19 00:06:56 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBfc0025b516359a7ce933ac23c547171e7404f629
USD importer: includes cleanup.
Removed unused includes and reordered includes.
===================================================================
M source/blender/io/usd/intern/usd_capi_import.cc
M source/blender/io/usd/intern/usd_reader_camera.cc
M source/blender/io/usd/intern/usd_reader_curve.cc
M source/blender/io/usd/intern/usd_reader_geom.cc
M source/blender/io/usd/intern/usd_reader_light.cc
M source/blender/io/usd/intern/usd_reader_material.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_mesh.h
M source/blender/io/usd/intern/usd_reader_nurbs.cc
M source/blender/io/usd/intern/usd_reader_prim.cc
M source/blender/io/usd/intern/usd_reader_prim.h
M source/blender/io/usd/intern/usd_reader_stage.h
M source/blender/io/usd/intern/usd_reader_volume.cc
M source/blender/io/usd/intern/usd_reader_xform.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index d04e738622a..8507c10d9ae 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -21,39 +21,15 @@
#include "usd.h"
#include "usd_common.h"
#include "usd_hierarchy_iterator.h"
-#include "usd_reader_instance.h"
-#include "usd_reader_mesh.h"
+#include "usd_reader_geom.h"
#include "usd_reader_prim.h"
#include "usd_reader_stage.h"
-#include <pxr/base/plug/registry.h>
-#include <pxr/pxr.h>
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/usdGeom/metrics.h>
-#include <pxr/usd/usdGeom/scope.h>
-#include <pxr/usd/usdGeom/tokens.h>
-#include <pxr/usd/usdGeom/xformCommonAPI.h>
-#include <pxr/usd/usdLux/domeLight.h>
-#include <pxr/usd/usdShade/materialBindingAPI.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
-
-#include "DNA_cachefile_types.h"
-#include "DNA_collection_types.h"
-#include "DNA_node_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_world_types.h"
-
#include "BKE_appdir.h"
#include "BKE_blender_version.h"
#include "BKE_cachefile.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_context.h"
-#include "BKE_curve.h"
#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
@@ -71,11 +47,26 @@
#include "BLI_path_util.h"
#include "BLI_string.h"
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
+
+#include "DNA_cachefile_types.h"
+#include "DNA_collection_types.h"
+#include "DNA_node_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_world_types.h"
+
+#include "MEM_guardedalloc.h"
+
#include "WM_api.h"
#include "WM_types.h"
-#include "usd_reader_geom.h"
-#include "usd_reader_prim.h"
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdGeom/metrics.h>
+#include <pxr/usd/usdGeom/scope.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdGeom/xformCommonAPI.h>
#include <iostream>
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 3458ffadf5f..8606d64c95e 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -15,33 +15,16 @@
*/
#include "usd_reader_camera.h"
-#include "usd_reader_prim.h"
-#include "DNA_cachefile_types.h"
#include "DNA_camera_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_camera.h"
-#include "BKE_constraint.h"
-#include "BKE_modifier.h"
#include "BKE_object.h"
-#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "BLI_math_geom.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
#include <pxr/pxr.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/primRange.h>
-#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/camera.h>
namespace blender::io::usd {
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 8ee495f8df4..675e2a4c17d 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -15,44 +15,22 @@
*/
#include "usd_reader_curve.h"
-#include "usd_reader_prim.h"
-#include "MEM_guardedalloc.h"
-
-#include "DNA_cachefile_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
-
-#include "BKE_camera.h"
-#include "BKE_constraint.h"
#include "BKE_curve.h"
-#include "BKE_library.h"
#include "BKE_mesh.h"
-#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_math_geom.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-#include "WM_api.h"
-#include "WM_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_object_types.h"
+
+#include "MEM_guardedalloc.h"
#include <pxr/base/vt/array.h>
#include <pxr/base/vt/types.h>
#include <pxr/base/vt/value.h>
-#include <pxr/pxr.h>
-#include <pxr/usd/sdf/assetPath.h>
-#include <pxr/usd/sdf/types.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/primRange.h>
-#include <pxr/usd/usd/stage.h>
+
#include <pxr/usd/usdGeom/basisCurves.h>
#include <pxr/usd/usdGeom/curves.h>
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index e1bf17dc3fc..c06bab4b758 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -15,26 +15,8 @@
*/
#include "usd_reader_geom.h"
-#include "usd_reader_prim.h"
-#include "MEM_guardedalloc.h"
-
-#include "DNA_cachefile_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
-
-#include "BKE_camera.h"
-#include "BKE_constraint.h"
-#include "BKE_curve.h"
#include "BKE_lib_id.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
@@ -44,19 +26,10 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include <pxr/base/vt/array.h>
-#include <pxr/base/vt/types.h>
-#include <pxr/base/vt/value.h>
-#include <pxr/pxr.h>
-#include <pxr/usd/sdf/assetPath.h>
-#include <pxr/usd/sdf/types.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/primRange.h>
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/usdGeom/mesh.h>
+#include "DNA_cachefile_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_space_types.h" /* for FILE_MAX */
namespace blender::io::usd {
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index 20b0adcd245..f609682191f 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -16,19 +16,11 @@
#include "usd_reader_light.h"
-#include "DNA_light_types.h"
-#include "DNA_object_types.h"
-
#include "BKE_light.h"
#include "BKE_object.h"
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include <pxr/pxr.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/primRange.h>
-#include <pxr/usd/usd/stage.h>
+#include "DNA_light_types.h"
+#include "DNA_object_types.h"
#include <pxr/usd/usdLux/light.h>
diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc
index 19193f71a67..0a2f487f9c9 100644
--- a/source/blender/io/usd/intern/usd_reader_material.cc
+++ b/source/blender/io/usd/intern/usd_reader_material.cc
@@ -19,23 +19,16 @@
#include "usd_reader_material.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-
#include "BKE_image.h"
-#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_material.h"
-#include "BKE_mesh.h"
#include "BKE_node.h"
-#include "BKE_object.h"
-#include "BLI_listbase.h"
#include "BLI_math_vector.h"
#include "BLI_string.h"
+#include "DNA_material_types.h"
+
#include <pxr/base/gf/vec3f.h>
#include <pxr/usd/usdShade/material.h>
#include <pxr/usd/usdShade/shader.h>
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 283f0971508..44d83996de1 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -16,50 +16,30 @@
#include "usd_reader_mesh.h"
#include "usd_reader_material.h"
-#include "usd_reader_prim.h"
-#include "MEM_guardedalloc.h"
-
-#include "DNA_cachefile_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_customdata_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
-
-#include "BKE_camera.h"
-#include "BKE_constraint.h"
-#include "BKE_curve.h"
#include "BKE_customdata.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
-#include "BKE_modifier.h"
#include "BKE_object.h"
-#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_math_geom.h"
#include "BLI_string.h"
-#include "BLI_utildefines.h"
-#include "WM_api.h"
-#include "WM_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+
+#include "MEM_guardedalloc.h"
#include <pxr/base/vt/array.h>
#include <pxr/base/vt/types.h>
#include <pxr/base/vt/value.h>
-#include <pxr/pxr.h>
-#include <pxr/usd/sdf/assetPath.h>
#include <pxr/usd/sdf/types.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/primRange.h>
-#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/mesh.h>
#include <pxr/usd/usdGeom/subset.h>
#include <pxr/usd/usdShade/materialBindingAPI.h>
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index 6a645f01bbb..ae84f0d575f 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -15,10 +15,11 @@
*/
#pragma once
-#include "pxr/usd/usdGeom/mesh.h"
#include "usd.h"
#include "usd_reader_geom.h"
+#include "pxr/usd/usdGeom/mesh.h"
+
struct MPoly;
namespace blender::io::usd {
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index bfa5b0c0296..e56e44b0602 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -15,45 +15,23 @@
*/
#include "
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list