From 2491cd5e16dc47ed2fda9d2e7dc589e16dce4638 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 23 Feb 2023 17:02:01 -0500 Subject: [PATCH] Cleanup: Move two subdiv headers to C++ --- .../blender/blenkernel/BKE_subdiv_foreach.h | 165 ------------------ .../blender/blenkernel/BKE_subdiv_foreach.hh | 157 +++++++++++++++++ .../{BKE_subdiv_mesh.h => BKE_subdiv_mesh.hh} | 21 +-- source/blender/blenkernel/CMakeLists.txt | 4 +- .../blender/blenkernel/intern/mesh_wrapper.cc | 2 +- .../intern/multires_reshape_smooth.cc | 4 +- .../intern/multires_reshape_util.cc | 4 +- .../intern/multires_reshape_vertcos.cc | 4 +- .../blenkernel/intern/multires_subdiv.cc | 2 +- .../blenkernel/intern/subdiv_deform.cc | 4 +- .../blenkernel/intern/subdiv_foreach.cc | 4 +- .../blender/blenkernel/intern/subdiv_mesh.cc | 4 +- .../intern/draw_cache_impl_subdivision.cc | 4 +- .../editors/uvedit/uvedit_unwrap_ops.cc | 2 +- .../blender/modifiers/intern/MOD_multires.cc | 2 +- .../blender/modifiers/intern/MOD_subsurf.cc | 2 +- .../geometry/nodes/node_geo_mesh_subdivide.cc | 2 +- .../nodes/node_geo_subdivision_surface.cc | 2 +- 18 files changed, 187 insertions(+), 202 deletions(-) delete mode 100644 source/blender/blenkernel/BKE_subdiv_foreach.h create mode 100644 source/blender/blenkernel/BKE_subdiv_foreach.hh rename source/blender/blenkernel/{BKE_subdiv_mesh.h => BKE_subdiv_mesh.hh} (73%) diff --git a/source/blender/blenkernel/BKE_subdiv_foreach.h b/source/blender/blenkernel/BKE_subdiv_foreach.h deleted file mode 100644 index 9afa5040772..00000000000 --- a/source/blender/blenkernel/BKE_subdiv_foreach.h +++ /dev/null @@ -1,165 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later - * Copyright 2018 Blender Foundation. All rights reserved. */ - -/** \file - * \ingroup bke - */ - -#pragma once - -#include "BLI_sys_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct Mesh; -struct Subdiv; -struct SubdivForeachContext; -struct SubdivToMeshSettings; - -typedef bool (*SubdivForeachTopologyInformationCb)(const struct SubdivForeachContext *context, - int num_vertices, - int num_edges, - int num_loops, - int num_polygons, - const int *subdiv_polygon_offset); - -typedef void (*SubdivForeachVertexFromCornerCb)(const struct SubdivForeachContext *context, - void *tls, - int ptex_face_index, - float u, - float v, - int coarse_vertex_index, - int coarse_poly_index, - int coarse_corner, - int subdiv_vertex_index); - -typedef void (*SubdivForeachVertexFromEdgeCb)(const struct SubdivForeachContext *context, - void *tls, - int ptex_face_index, - float u, - float v, - int coarse_edge_index, - int coarse_poly_index, - int coarse_corner, - int subdiv_vertex_index); - -typedef void (*SubdivForeachVertexInnerCb)(const struct SubdivForeachContext *context, - void *tls, - int ptex_face_index, - float u, - float v, - int coarse_poly_index, - int coarse_corner, - int subdiv_vertex_index); - -typedef void (*SubdivForeachEdgeCb)(const struct SubdivForeachContext *context, - void *tls, - int coarse_edge_index, - int subdiv_edge_index, - bool is_loose, - int subdiv_v1, - int subdiv_v2); - -typedef void (*SubdivForeachLoopCb)(const struct SubdivForeachContext *context, - void *tls, - int ptex_face_index, - float u, - float v, - int coarse_loop_index, - int coarse_poly_index, - int coarse_corner, - int subdiv_loop_index, - int subdiv_vertex_index, - int subdiv_edge_index); - -typedef void (*SubdivForeachPolygonCb)(const struct SubdivForeachContext *context, - void *tls, - int coarse_poly_index, - int subdiv_poly_index, - int start_loop_index, - int num_loops); - -typedef void (*SubdivForeachLooseCb)(const struct SubdivForeachContext *context, - void *tls, - int coarse_vertex_index, - int subdiv_vertex_index); - -typedef void (*SubdivForeachVertexOfLooseEdgeCb)(const struct SubdivForeachContext *context, - void *tls, - int coarse_edge_index, - float u, - int subdiv_vertex_index); - -typedef struct SubdivForeachContext { - /* Is called when topology information becomes available. - * Is only called once. - * - * NOTE: If this callback returns false, the foreach loop is aborted. - */ - SubdivForeachTopologyInformationCb topology_info; - /* These callbacks are called from every ptex which shares "emitting" - * vertex or edge. - */ - SubdivForeachVertexFromCornerCb vertex_every_corner; - SubdivForeachVertexFromEdgeCb vertex_every_edge; - /* Those callbacks are run once per subdivision vertex, ptex is undefined - * as in it will be whatever first ptex face happened to be traversed in - * the multi-threaded environment and which shares "emitting" vertex or - * edge. - */ - SubdivForeachVertexFromCornerCb vertex_corner; - SubdivForeachVertexFromEdgeCb vertex_edge; - /* Called exactly once, always corresponds to a single ptex face. */ - SubdivForeachVertexInnerCb vertex_inner; - /* Called once for each loose vertex. One loose coarse vertex corresponds - * to a single subdivision vertex. - */ - SubdivForeachLooseCb vertex_loose; - /* Called once per vertex created for loose edge. */ - SubdivForeachVertexOfLooseEdgeCb vertex_of_loose_edge; - /* NOTE: If subdivided edge does not come from coarse edge, ORIGINDEX_NONE - * will be passed as coarse_edge_index. - */ - SubdivForeachEdgeCb edge; - /* NOTE: If subdivided loop does not come from coarse loop, ORIGINDEX_NONE - * will be passed as coarse_loop_index. - */ - SubdivForeachLoopCb loop; - SubdivForeachPolygonCb poly; - - /* User-defined pointer, to allow callbacks know something about context the - * traversal is happening for. - */ - void *user_data; - - /* Initial value of TLS data. */ - void *user_data_tls; - /* Size of TLS data. */ - size_t user_data_tls_size; - /* Function to free TLS storage. */ - void (*user_data_tls_free)(void *tls); -} SubdivForeachContext; - -/* Invokes callbacks in the order and with values which corresponds to creation - * of final subdivided mesh. - * - * Main goal is to abstract all the traversal routines to give geometry element - * indices (for vertices, edges, loops, polygons) in the same way as subdivision - * modifier will do for a dense mesh. - * - * Returns true if the whole topology was traversed, without any early exits. - * - * TODO(sergey): Need to either get rid of subdiv or of coarse_mesh. - * The main point here is to be able to get base level topology, which can be - * done with either of those. Having both of them is kind of redundant. - */ -bool BKE_subdiv_foreach_subdiv_geometry(struct Subdiv *subdiv, - const struct SubdivForeachContext *context, - const struct SubdivToMeshSettings *mesh_settings, - const struct Mesh *coarse_mesh); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_subdiv_foreach.hh b/source/blender/blenkernel/BKE_subdiv_foreach.hh new file mode 100644 index 00000000000..a573a62942d --- /dev/null +++ b/source/blender/blenkernel/BKE_subdiv_foreach.hh @@ -0,0 +1,157 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2018 Blender Foundation. All rights reserved. */ + +/** \file + * \ingroup bke + */ + +#pragma once + +#include "BLI_sys_types.h" + +struct Mesh; +struct Subdiv; +struct SubdivForeachContext; +struct SubdivToMeshSettings; + +using SubdivForeachTopologyInformationCb = bool (*)(const SubdivForeachContext *context, + int num_vertices, + int num_edges, + int num_loops, + int num_polygons, + const int *subdiv_polygon_offset); + +using SubdivForeachVertexFromCornerCb = void (*)(const SubdivForeachContext *context, + void *tls, + int ptex_face_index, + float u, + float v, + int coarse_vertex_index, + int coarse_poly_index, + int coarse_corner, + int subdiv_vertex_index); + +using SubdivForeachVertexFromEdgeCb = void (*)(const SubdivForeachContext *context, + void *tls, + int ptex_face_index, + float u, + float v, + int coarse_edge_index, + int coarse_poly_index, + int coarse_corner, + int subdiv_vertex_index); + +using SubdivForeachVertexInnerCb = void (*)(const SubdivForeachContext *context, + void *tls, + int ptex_face_index, + float u, + float v, + int coarse_poly_index, + int coarse_corner, + int subdiv_vertex_index); + +using SubdivForeachEdgeCb = void (*)(const SubdivForeachContext *context, + void *tls, + int coarse_edge_index, + int subdiv_edge_index, + bool is_loose, + int subdiv_v1, + int subdiv_v2); + +using SubdivForeachLoopCb = void (*)(const SubdivForeachContext *context, + void *tls, + int ptex_face_index, + float u, + float v, + int coarse_loop_index, + int coarse_poly_index, + int coarse_corner, + int subdiv_loop_index, + int subdiv_vertex_index, + int subdiv_edge_index); + +using SubdivForeachPolygonCb = void (*)(const SubdivForeachContext *context, + void *tls, + int coarse_poly_index, + int subdiv_poly_index, + int start_loop_index, + int num_loops); + +using SubdivForeachLooseCb = void (*)(const SubdivForeachContext *context, + void *tls, + int coarse_vertex_index, + int subdiv_vertex_index); + +using SubdivForeachVertexOfLooseEdgeCb = void (*)(const SubdivForeachContext *context, + void *tls, + int coarse_edge_index, + float u, + int subdiv_vertex_index); + +struct SubdivForeachContext { + /* Is called when topology information becomes available. + * Is only called once. + * + * NOTE: If this callback returns false, the foreach loop is aborted. + */ + SubdivForeachTopologyInformationCb topology_info; + /* These callbacks are called from every ptex which shares "emitting" + * vertex or edge. + */ + SubdivForeachVertexFromCornerCb vertex_every_corner; + SubdivForeachVertexFromEdgeCb vertex_every_edge; + /* Those callbacks are run once per subdivision vertex, ptex is undefined + * as in it will be whatever first ptex face happened to be traversed in + * the multi-threaded environment and which shares "emitting" vertex or + * edge. + */ + SubdivForeachVertexFromCornerCb vertex_corner; + SubdivForeachVertexFromEdgeCb vertex_edge; + /* Called exactly once, always corresponds to a single ptex face. */ + SubdivForeachVertexInnerCb vertex_inner; + /* Called once for each loose vertex. One loose coarse vertex corresponds + * to a single subdivision vertex. + */ + SubdivForeachLooseCb vertex_loose; + /* Called once per vertex created for loose edge. */ + SubdivForeachVertexOfLooseEdgeCb vertex_of_loose_edge; + /* NOTE: If subdivided edge does not come from coarse edge, ORIGINDEX_NONE + * will be passed as coarse_edge_index. + */ + SubdivForeachEdgeCb edge; + /* NOTE: If subdivided loop does not come from coarse loop, ORIGINDEX_NONE + * will be passed as coarse_loop_index. + */ + SubdivForeachLoopCb loop; + SubdivForeachPolygonCb poly; + + /* User-defined pointer, to allow callbacks know something about context the + * traversal is happening for. + */ + void *user_data; + + /* Initial value of TLS data. */ + void *user_data_tls; + /* Size of TLS data. */ + size_t user_data_tls_size; + /* Function to free TLS storage. */ + void (*user_data_tls_free)(void *tls); +}; + +/* Invokes callbacks in the order and with values which corresponds to creation + * of final subdivided mesh. + * + * Main goal is to abstract all the traversal routines to give geometry element + * indices (for vertices, edges, loops, polygons) in the same way as subdivision + * modifier will do for a dense mesh. + * + * Returns true if the whole topology was traversed, without any early exits. + * + * TODO(sergey): Need to either get rid of subdiv or of coarse_mesh. + * The main point here is to be able to get base level topology, which can be + * done with either of those. Having both of them is kind of redundant. + */ +bool BKE_subdiv_foreach_subdiv_geometry(Subdiv *subdiv, + const SubdivForeachContext *context, + const SubdivToMeshSettings *mesh_settings, + const Mesh *coarse_mesh); diff --git a/source/blender/blenkernel/BKE_subdiv_mesh.h b/source/blender/blenkernel/BKE_subdiv_mesh.hh similarity index 73% rename from source/blender/blenkernel/BKE_subdiv_mesh.h rename to source/blender/blenkernel/BKE_subdiv_mesh.hh index d1ccc60061c..5e57270a5bc 100644 --- a/source/blender/blenkernel/BKE_subdiv_mesh.h +++ b/source/blender/blenkernel/BKE_subdiv_mesh.hh @@ -9,16 +9,12 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Mesh; struct MeshElemMap; struct MEdge; struct Subdiv; -typedef struct SubdivToMeshSettings { +struct SubdivToMeshSettings { /* Resolution at which regular ptex (created for quad polygon) are being * evaluated. This defines how many vertices final mesh will have: every * regular ptex has resolution^2 vertices. Special (irregular, or ptex @@ -28,23 +24,20 @@ typedef struct SubdivToMeshSettings { int resolution; /* When true, only edges emitted from coarse ones will be displayed. */ bool use_optimal_display; -} SubdivToMeshSettings; +}; /* Create real hi-res mesh from subdivision, all geometry is "real". */ -struct Mesh *BKE_subdiv_to_mesh(struct Subdiv *subdiv, - const SubdivToMeshSettings *settings, - const struct Mesh *coarse_mesh); +Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv, + const SubdivToMeshSettings *settings, + const Mesh *coarse_mesh); /* Interpolate a position along the `coarse_edge` at the relative `u` coordinate. If `is_simple` is * false, this will perform a B-Spline interpolation using the edge neighbors, otherwise a linear * interpolation will be done base on the edge vertices. */ void BKE_subdiv_mesh_interpolate_position_on_edge(const float (*coarse_positions)[3], - const struct MEdge *coarse_edges, - const struct MeshElemMap *vert_to_edge_map, + const MEdge *coarse_edges, + const MeshElemMap *vert_to_edge_map, int coarse_edge_index, bool is_simple, float u, float pos_r[3]); -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 1a84e0d9a32..bad71c19afa 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -469,8 +469,8 @@ set(SRC BKE_subdiv_ccg.h BKE_subdiv_deform.h BKE_subdiv_eval.h - BKE_subdiv_foreach.h - BKE_subdiv_mesh.h + BKE_subdiv_foreach.hh + BKE_subdiv_mesh.hh BKE_subdiv_modifier.h BKE_subdiv_topology.h BKE_subsurf.h diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index 555ae98e2d8..a7e5d999cf6 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -40,7 +40,7 @@ #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "BKE_subdiv_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.cc b/source/blender/blenkernel/intern/multires_reshape_smooth.cc index ce8df750f8a..a245560d6e7 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.cc +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.cc @@ -22,8 +22,8 @@ #include "BKE_multires.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" #include "opensubdiv_converter_capi.h" #include "opensubdiv_evaluator_capi.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_util.cc b/source/blender/blenkernel/intern/multires_reshape_util.cc index d0dbfd0a144..f5f6175c21f 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.cc +++ b/source/blender/blenkernel/intern/multires_reshape_util.cc @@ -24,8 +24,8 @@ #include "BKE_subdiv.h" #include "BKE_subdiv_ccg.h" #include "BKE_subdiv_eval.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_vertcos.cc b/source/blender/blenkernel/intern/multires_reshape_vertcos.cc index 12c67ad104e..711222bdac5 100644 --- a/source/blender/blenkernel/intern/multires_reshape_vertcos.cc +++ b/source/blender/blenkernel/intern/multires_reshape_vertcos.cc @@ -12,8 +12,8 @@ #include "BLI_math_vector.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" struct MultiresReshapeAssignVertcosContext { const MultiresReshapeContext *reshape_context; diff --git a/source/blender/blenkernel/intern/multires_subdiv.cc b/source/blender/blenkernel/intern/multires_subdiv.cc index cb133e93f68..704d3fde1f1 100644 --- a/source/blender/blenkernel/intern/multires_subdiv.cc +++ b/source/blender/blenkernel/intern/multires_subdiv.cc @@ -16,7 +16,7 @@ #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" void BKE_multires_subdiv_settings_init(SubdivSettings *settings, const MultiresModifierData *mmd) { diff --git a/source/blender/blenkernel/intern/subdiv_deform.cc b/source/blender/blenkernel/intern/subdiv_deform.cc index b5a0d6cb040..8214d0e7704 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.cc +++ b/source/blender/blenkernel/intern/subdiv_deform.cc @@ -18,8 +18,8 @@ #include "BKE_customdata.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.cc b/source/blender/blenkernel/intern/subdiv_foreach.cc index 414781f137a..e1ef4cdc15f 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.cc +++ b/source/blender/blenkernel/intern/subdiv_foreach.cc @@ -5,7 +5,7 @@ * \ingroup bke */ -#include "BKE_subdiv_foreach.h" +#include "BKE_subdiv_foreach.hh" #include "atomic_ops.h" @@ -20,7 +20,7 @@ #include "BKE_key.h" #include "BKE_mesh.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index 727772a20f0..a1e137f6000 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -24,8 +24,8 @@ #include "BKE_mesh_mapping.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 0fe5eba26f4..de8df455355 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -16,8 +16,8 @@ #include "BKE_scene.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" -#include "BKE_subdiv_foreach.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_foreach.hh" +#include "BKE_subdiv_mesh.hh" #include "BKE_subdiv_modifier.h" #include "BLI_linklist.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 1cd5b2e6ce1..4cfaf6b5428 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -42,7 +42,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "BKE_subdiv_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index c65774fd5ff..6491cc6cb6d 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -29,7 +29,7 @@ #include "BKE_subdiv.h" #include "BKE_subdiv_ccg.h" #include "BKE_subdiv_deform.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "BKE_subsurf.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index 440c36fe19f..412db630ee9 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -30,7 +30,7 @@ #include "BKE_subdiv.h" #include "BKE_subdiv_ccg.h" #include "BKE_subdiv_deform.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "BKE_subdiv_modifier.h" #include "BKE_subsurf.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc index 0fd3db6c1a7..c4ef7f8944f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -2,7 +2,7 @@ #include "BKE_mesh.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index 3c06ce8b3f0..69d82f0cb4e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -9,7 +9,7 @@ #include "BKE_attribute.hh" #include "BKE_mesh.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_mesh.h" +#include "BKE_subdiv_mesh.hh" #include "UI_interface.h" #include "UI_resources.h"