Cleanup: Move draw_subdivision.h to C++

source/blender/draw/CMakeLists.txt

@@ -261,7 +261,7 @@ set(SRC
   intern/draw_shader.h
   intern/draw_shader_shared.h
   intern/draw_state.h
-  intern/draw_subdivision.h
+  intern/draw_subdivision.hh
   intern/draw_texture_pool.h
   intern/draw_view.h
   intern/draw_view.hh

source/blender/draw/intern/draw_cache_extract_mesh.cc

@@ -27,7 +27,7 @@
 
 #include "draw_cache_extract.hh"
 #include "draw_cache_inline.h"
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 #include "mesh_extractors/extract_mesh.hh"
 

source/blender/draw/intern/draw_cache_impl_mesh.cc

@@ -59,7 +59,7 @@
 
 #include "draw_cache_extract.hh"
 #include "draw_cache_inline.h"
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 #include "draw_cache_impl.hh" /* own include */
 #include "draw_manager.h"

source/blender/draw/intern/draw_cache_impl_subdivision.cc

@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"

source/blender/draw/intern/draw_manager_c.cc

@@ -82,7 +82,7 @@
 #include "draw_manager_testing.h"
 #include "draw_manager_text.h"
 #include "draw_shader.h"
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "draw_texture_pool.h"
 
 /* only for callbacks */

source/blender/draw/intern/draw_subdivision.hh

@@ -4,10 +4,7 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include "BLI_span.hh"
 #include "BLI_sys_types.h"
 
 struct BMesh;
@@ -297,18 +294,9 @@ void draw_subdiv_build_edituv_stretch_angle_buffer(const DRWSubdivCache &cache,
 /** Return the format used for the positions and normals VBO. */
 struct GPUVertFormat *draw_subdiv_get_pos_nor_format(void);
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#  include "BLI_span.hh"
-
 /* Helper to access the loose edges. */
 blender::Span<DRWSubdivLooseEdge> draw_subdiv_cache_get_loose_edges(const DRWSubdivCache &cache);
 
 /* Helper to access only the loose vertices, i.e. not the ones attached to loose edges. To access
  * loose vertices of loose edges #draw_subdiv_cache_get_loose_edges should be used. */
 blender::Span<DRWSubdivLooseVertex> draw_subdiv_cache_get_loose_verts(const DRWSubdivCache &cache);
-
-#endif

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc

@@ -10,7 +10,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 /* ---------------------------------------------------------------------- */

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc

@@ -10,7 +10,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc

@@ -12,7 +12,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc

@@ -12,7 +12,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc

@@ -10,7 +10,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc

@@ -10,7 +10,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc

@@ -18,7 +18,7 @@
 
 #include "attribute_convert.hh"
 #include "draw_attributes.hh"
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc

@@ -12,7 +12,7 @@
 
 #include "GPU_capabilities.h"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 #define FORCE_HIDE 255

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc

@@ -10,7 +10,7 @@
 
 #include "draw_cache_impl.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc

@@ -12,7 +12,7 @@
 
 #include "draw_cache_impl.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc

@@ -14,7 +14,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc

@@ -14,7 +14,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc

@@ -10,7 +10,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc

@@ -8,7 +8,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc

@@ -10,7 +10,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc

@@ -14,7 +14,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_paint.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc

@@ -6,7 +6,7 @@
  * \ingroup draw
  */
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc

@@ -17,7 +17,7 @@
 
 #include "extract_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc

@@ -10,7 +10,7 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc

@@ -11,7 +11,7 @@
 #include "BKE_deform.h"
 #include "BKE_mesh.hh"
 
-#include "draw_subdivision.h"
+#include "draw_subdivision.hh"
 #include "extract_mesh.hh"
 
 namespace blender::draw {