Cleanup: Remove unused includes, use consistent order

2021-04-08 13:07:25 -05:00 · 2021-04-08 13:07:25 -05:00 · 223093ed17
parent 1ec9ac2016
commit 223093ed17
28 changed files with 36 additions and 109 deletions
--- a/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc
@ -14,13 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BLI_math_rotation.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_align_rotation_to_vector_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Factor")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_clamp.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_clamp.cc
@ -15,11 +15,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_clamp_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Attribute")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
@ -14,13 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BKE_colorband.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_color_ramp_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Attribute")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc
@ -14,11 +14,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_combine_xyz_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("X")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
@ -14,23 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BKE_attribute.h"
-#include "BKE_attribute_access.hh"
-
-#include "BLI_array.hh"
-#include "BLI_math_base_safe.h"
-#include "BLI_rand.hh"
-
-#include "DNA_mesh_types.h"
-#include "DNA_pointcloud_types.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

 #include "NOD_math_functions.hh"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_compare_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("A")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_convert.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_convert.cc
@ -14,11 +14,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_convert_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Attribute")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc
@ -14,16 +14,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BLI_rand.hh"
-
-#include "DNA_mesh_types.h"
-#include "DNA_pointcloud_types.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_fill_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Attribute")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_map_range.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_map_range.cc
@ -14,13 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BLI_math_base_safe.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_map_range_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Attribute")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
@ -14,23 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BKE_attribute.h"
-#include "BKE_attribute_access.hh"
-
-#include "BLI_array.hh"
-#include "BLI_math_base_safe.h"
-#include "BLI_rand.hh"
-
-#include "DNA_mesh_types.h"
-#include "DNA_pointcloud_types.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

 #include "NOD_math_functions.hh"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_math_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("A")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_randomize.cc
@ -14,16 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BLI_hash.h"
 #include "BLI_rand.hh"

 #include "UI_interface.h"
 #include "UI_resources.h"

-#include "DNA_mesh_types.h"
-#include "DNA_pointcloud_types.h"
+#include "node_geometry_util.hh"

 static bNodeSocketTemplate geo_node_attribute_randomize_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc
@ -14,13 +14,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "DNA_material_types.h"
-
-#include "node_geometry_util.hh"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_separate_xyz_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Vector")},
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc
@ -14,23 +14,15 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BKE_attribute.h"
-#include "BKE_attribute_access.hh"
-
-#include "BLI_array.hh"
 #include "BLI_math_base_safe.h"
-#include "BLI_rand.hh"
-
-#include "DNA_mesh_types.h"
-#include "DNA_pointcloud_types.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

 #include "NOD_math_functions.hh"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_attribute_vector_math_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("A")},
--- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
@ -16,7 +16,6 @@

 #include "DNA_mesh_types.h"

-#include "BKE_mesh.h"
 #include "BKE_mesh_boolean_convert.hh"

 #include "UI_interface.h"
--- a/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc
@ -14,10 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BLI_task.hh"
-
-#include "BLI_math_matrix.h"
-
 #include "node_geometry_util.hh"

 static bNodeSocketTemplate geo_node_bounding_box_in[] = {
--- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
@ -14,8 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BLI_math_matrix.h"

 #include "DNA_collection_types.h"
@ -23,6 +21,8 @@
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_collection_info_in[] = {
    {SOCK_COLLECTION, N_("Collection")},
    {-1, ""},
--- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
@ -14,9 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BLI_math_base.h"
-#include "BLI_math_rotation.h"
-
 #include "DNA_modifier_types.h"

 #include "node_geometry_util.hh"
--- a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc
@ -14,10 +14,10 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "DEG_depsgraph_query.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_is_viewport_out[] = {
    {SOCK_BOOLEAN, N_("Is Viewport")},
    {-1, ""},
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
@ -14,9 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BLI_map.hh"
-#include "BLI_math_matrix.h"
-
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@ -14,9 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BLI_map.hh"
-#include "BLI_math_matrix.h"
-
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

--- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
@ -14,18 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BKE_mesh.h"
-#include "BKE_mesh_wrapper.h"
-#include "BKE_modifier.h"
-#include "BKE_volume.h"
-
 #include "BLI_math_matrix.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_object_info_in[] = {
    {SOCK_OBJECT, N_("Object")},
    {-1, ""},
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@ -14,12 +14,9 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BLI_float3.hh"
 #include "BLI_hash.h"
 #include "BLI_kdtree.h"
-#include "BLI_math_vector.h"
 #include "BLI_rand.hh"
-#include "BLI_span.hh"
 #include "BLI_timeit.hh"

 #include "DNA_mesh_types.h"
@ -28,7 +25,6 @@

 #include "BKE_attribute_math.hh"
 #include "BKE_bvhutils.h"
-#include "BKE_deform.h"
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
--- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
@ -14,13 +14,9 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "BKE_mesh.h"
 #include "BKE_persistent_data_handle.hh"

 #include "DNA_collection_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_pointcloud_types.h"

 #include "BLI_hash.h"

--- a/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc
@ -14,13 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BLI_math_rotation.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_point_rotate_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Axis")},
--- a/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc
@ -14,13 +14,13 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
 #include "BKE_colorband.h"

 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_point_scale_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Factor")},
--- a/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc
@ -14,13 +14,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "node_geometry_util.hh"
-
-#include "BKE_colorband.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"

+#include "node_geometry_util.hh"
+
 static bNodeSocketTemplate geo_node_point_translate_in[] = {
    {SOCK_GEOMETRY, N_("Geometry")},
    {SOCK_STRING, N_("Translation")},
--- a/source/blender/nodes/geometry/nodes/node_geo_subdivide.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_subdivide.cc
@ -14,7 +14,7 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "MEM_guardedalloc.h"
+// #include "MEM_guardedalloc.h"

 #include "BKE_mesh.h"
 #include "BKE_subdiv.h"
--- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
@ -14,8 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "MEM_guardedalloc.h"
-
 #include "BKE_mesh.h"
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_mesh.h"
--- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
@ -14,10 +14,6 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "DNA_node_types.h"
-
-#include "RNA_enum_types.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"