From 69e2ca9fb5df7ca59d489ec4fe098b99aa3b7a9a Mon Sep 17 00:00:00 2001
From: Hans Goudey <hans@blender.org>
Date: Fri, 21 Jun 2024 12:00:26 -0400
Subject: [PATCH] Cleanup: Sculpt: Make undo geometry struct definition private

---
 .../editors/sculpt_paint/sculpt_intern.hh     | 19 --------------
 .../editors/sculpt_paint/sculpt_undo.cc       | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh
index 0ae90cfaa42..bf56f76f66f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.hh
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh
@@ -137,25 +137,6 @@ enum class Type : int8_t {
   Color,
 };
 
-/* Storage of geometry for the undo node.
- * Is used as a storage for either original or modified geometry. */
-struct NodeGeometry {
-  /* Is used for sanity check, helping with ensuring that two and only two
-   * geometry pushes happened in the undo stack. */
-  bool is_initialized;
-
-  CustomData vert_data;
-  CustomData edge_data;
-  CustomData corner_data;
-  CustomData face_data;
-  int *face_offset_indices;
-  const ImplicitSharingInfo *face_offsets_sharing_info;
-  int totvert;
-  int totedge;
-  int totloop;
-  int faces_num;
-};
-
 struct Node {
   Array<float3> position;
   Array<float3> orig_position;
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc
index f054542a4e8..7a50aec6c1f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc
@@ -124,6 +124,25 @@ namespace blender::ed::sculpt_paint::undo {
 
 #define NO_ACTIVE_LAYER bke::AttrDomain::Auto
 
+/* Storage of geometry for the undo node.
+ * Is used as a storage for either original or modified geometry. */
+struct NodeGeometry {
+  /* Is used for sanity check, helping with ensuring that two and only two
+   * geometry pushes happened in the undo stack. */
+  bool is_initialized;
+
+  CustomData vert_data;
+  CustomData edge_data;
+  CustomData corner_data;
+  CustomData face_data;
+  int *face_offset_indices;
+  const ImplicitSharingInfo *face_offsets_sharing_info;
+  int totvert;
+  int totedge;
+  int totloop;
+  int faces_num;
+};
+
 struct StepData {
   /**
    * The type of data stored in this undo step. For historical reasons this is often set when the
@@ -157,14 +176,14 @@ struct StepData {
    *
    * Modified geometry is stored after the modification and is used to redo the modification. */
   bool geometry_clear_pbvh;
-  undo::NodeGeometry geometry_original;
-  undo::NodeGeometry geometry_modified;
+  NodeGeometry geometry_original;
+  NodeGeometry geometry_modified;
 
   /* bmesh */
   BMLogEntry *bm_entry;
 
   /* Geometry at the bmesh enter moment. */
-  undo::NodeGeometry geometry_bmesh_enter;
+  NodeGeometry geometry_bmesh_enter;
 
   bool applied;