From 17b2ff611902f82b07f6b536f1a143b2c5d725a6 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Tue, 12 Mar 2024 07:00:33 -0400 Subject: [PATCH] Refactor: rename files mesh_boolean_convert to mesh_boolean. A follow-up to previous commit that moved these files to geometry. The _convert suffix made sense at one point but is now just confusing. --- source/blender/geometry/CMakeLists.txt | 4 ++-- .../{GEO_mesh_boolean_convert.hh => GEO_mesh_boolean.hh} | 0 .../intern/{mesh_boolean_convert.cc => mesh_boolean.cc} | 2 +- source/blender/modifiers/intern/MOD_boolean.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_boolean.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename source/blender/geometry/{GEO_mesh_boolean_convert.hh => GEO_mesh_boolean.hh} (100%) rename source/blender/geometry/intern/{mesh_boolean_convert.cc => mesh_boolean.cc} (99%) diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt index 3b3e60f7cb5..79c0e31fc4d 100644 --- a/source/blender/geometry/CMakeLists.txt +++ b/source/blender/geometry/CMakeLists.txt @@ -20,7 +20,7 @@ set(SRC intern/extend_curves.cc intern/fillet_curves.cc intern/join_geometries.cc - intern/mesh_boolean_convert.cc + intern/mesh_boolean.cc intern/mesh_copy_selection.cc intern/mesh_merge_by_distance.cc intern/mesh_primitive_cuboid.cc @@ -54,7 +54,7 @@ set(SRC GEO_extend_curves.hh GEO_fillet_curves.hh GEO_join_geometries.hh - GEO_mesh_boolean_convert.hh + GEO_mesh_boolean.hh GEO_mesh_copy_selection.hh GEO_mesh_merge_by_distance.hh GEO_mesh_primitive_cuboid.hh diff --git a/source/blender/geometry/GEO_mesh_boolean_convert.hh b/source/blender/geometry/GEO_mesh_boolean.hh similarity index 100% rename from source/blender/geometry/GEO_mesh_boolean_convert.hh rename to source/blender/geometry/GEO_mesh_boolean.hh diff --git a/source/blender/geometry/intern/mesh_boolean_convert.cc b/source/blender/geometry/intern/mesh_boolean.cc similarity index 99% rename from source/blender/geometry/intern/mesh_boolean_convert.cc rename to source/blender/geometry/intern/mesh_boolean.cc index fce8eb7bdf5..fae8a944d71 100644 --- a/source/blender/geometry/intern/mesh_boolean_convert.cc +++ b/source/blender/geometry/intern/mesh_boolean.cc @@ -25,7 +25,7 @@ #include "BLI_task.hh" #include "BLI_virtual_array.hh" -#include "GEO_mesh_boolean_convert.hh" +#include "GEO_mesh_boolean.hh" namespace blender::meshintersect { diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 9eb2e8cddc7..3e098b698c7 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -44,7 +44,7 @@ #include "MEM_guardedalloc.h" -#include "GEO_mesh_boolean_convert.hh" +#include "GEO_mesh_boolean.hh" #include "GEO_randomize.hh" #include "bmesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index d4b6ccc75ea..4ffb3c0fba2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GEO_mesh_boolean_convert.hh" +#include "GEO_mesh_boolean.hh" #include "GEO_randomize.hh" #include "node_geometry_util.hh"