[Bf-blender-cvs] [d42d4e339f2] master: Cleanup: Remove unnecessary includes in geometry set header
Hans Goudey
noreply at git.blender.org
Tue Jan 17 19:50:24 CET 2023
Commit: d42d4e339f20a0eb95b9f333159edea446e8b364
Author: Hans Goudey
Date: Tue Jan 17 12:45:51 2023 -0600
Branches: master
https://developer.blender.org/rBd42d4e339f20a0eb95b9f333159edea446e8b364
Cleanup: Remove unnecessary includes in geometry set header
===================================================================
M source/blender/blenkernel/BKE_geometry_fields.hh
M source/blender/blenkernel/BKE_geometry_set.hh
M source/blender/blenkernel/BKE_geometry_set_instances.hh
M source/blender/nodes/geometry/node_geometry_util.hh
M source/blender/nodes/intern/node_socket.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_geometry_fields.hh b/source/blender/blenkernel/BKE_geometry_fields.hh
index 5f5333beb63..019ff41184b 100644
--- a/source/blender/blenkernel/BKE_geometry_fields.hh
+++ b/source/blender/blenkernel/BKE_geometry_fields.hh
@@ -8,7 +8,6 @@
* Common field utilities and field definitions for geometry components.
*/
-#include "BKE_attribute.h"
#include "BKE_geometry_set.hh"
#include "FN_field.hh"
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh
index 42d773055fa..f450ffe33e8 100644
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@ -10,16 +10,12 @@
#include <iostream>
#include <mutex>
-#include "BLI_float4x4.hh"
#include "BLI_function_ref.hh"
-#include "BLI_hash.hh"
#include "BLI_map.hh"
#include "BLI_math_vector_types.hh"
-#include "BLI_set.hh"
#include "BLI_user_counter.hh"
#include "BLI_vector_set.hh"
-#include "BKE_anonymous_attribute_id.hh"
#include "BKE_attribute.hh"
#include "BKE_geometry_set.h"
diff --git a/source/blender/blenkernel/BKE_geometry_set_instances.hh b/source/blender/blenkernel/BKE_geometry_set_instances.hh
index 6d4b9a2128c..3e9fb1d0379 100644
--- a/source/blender/blenkernel/BKE_geometry_set_instances.hh
+++ b/source/blender/blenkernel/BKE_geometry_set_instances.hh
@@ -2,6 +2,8 @@
#pragma once
+#include "BLI_float4x4.hh"
+
#include "BKE_geometry_set.hh"
namespace blender::bke {
diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh
index 68205c3ce6b..84dbd8e1fef 100644
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@ -4,6 +4,7 @@
#include <string.h>
+#include "BLI_float4x4.hh"
#include "BLI_math_vector_types.hh"
#include "BLI_utildefines.h"
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc
index 2fbf14b4760..814ad1c80e1 100644
--- a/source/blender/nodes/intern/node_socket.cc
+++ b/source/blender/nodes/intern/node_socket.cc
@@ -11,6 +11,7 @@
#include "BLI_color.hh"
#include "BLI_listbase.h"
+#include "BLI_math_vector.h"
#include "BLI_math_vector_types.hh"
#include "BLI_string.h"
#include "BLI_utildefines.h"
More information about the Bf-blender-cvs
mailing list