Cleanup: Move BMesh headers to C++

Pull Request: https://projects.blender.org/blender/blender/pulls/115817
2023-12-05 23:01:12 +01:00
parent 383db31556
commit 7a96c4672c
225 changed files with 428 additions and 860 deletions
@@ -43,7 +43,7 @@ using eCustomDataMask = uint64_t;

 /**
 * UV map related customdata offsets into BMesh attribute blocks. See #BM_uv_map_get_offsets.
- * Defined in #BKE_customdata.hh to avoid including bmesh.h in many unrelated areas.
+ * Defined in #BKE_customdata.hh to avoid including bmesh.hh in many unrelated areas.
 * An offset of -1 means that the corresponding layer does not exist.
 */
 struct BMUVOffsets {
@@ -13,7 +13,7 @@
 */

 #include "DNA_customdata_types.h"
-#include "bmesh.h"
+#include "bmesh.hh"

 struct BMLoop;
 struct BMPartialUpdate;
@@ -25,7 +25,7 @@
 #include "BKE_attribute.h"
 #include "BKE_pbvh.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 struct BMFace;
 struct BMesh;
@@ -29,7 +29,7 @@
 #include "BKE_ccg.h"
 #include "BKE_pbvh.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 struct BMLog;
 struct BMesh;
@@ -54,7 +54,7 @@

 #include "BLO_read_write.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 #include "CLG_log.h"

@@ -23,8 +23,8 @@
 #include "BKE_mesh_fair.hh"
 #include "BKE_mesh_mapping.hh"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

 #include "MEM_guardedalloc.h"
 #include "eigen_capi.h"
@@ -23,8 +23,8 @@
 #include "BKE_mesh_mirror.hh"
 #include "BKE_modifier.hh"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

 #include "MEM_guardedalloc.h"

@@ -39,7 +39,7 @@
 #include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_sample.hh"

-#include "bmesh_tools.h"
+#include "bmesh_tools.hh"

 #ifdef WITH_OPENVDB
 #  include <openvdb/openvdb.h>
@@ -29,7 +29,7 @@
 #include "BKE_subdiv.hh"
 #include "BKE_subsurf.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 #include "DEG_depsgraph_query.hh"

@@ -73,7 +73,7 @@

 #include "BLO_read_write.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 using blender::float3;
 using blender::MutableSpan;
@@ -41,7 +41,7 @@

 #include "PIL_time.h"

-#include "bmesh.h"
+#include "bmesh.hh"

 #include "atomic_ops.h"

@@ -24,7 +24,7 @@

 #include "DRW_pbvh.hh"

-#include "bmesh.h"
+#include "bmesh.hh"
 #include "pbvh_intern.hh"

 #include "PIL_time.h"
@@ -32,7 +32,7 @@

 #include "PIL_time.h"

-#include "bmesh.h"
+#include "bmesh.hh"

 #include "atomic_ops.h"

@@ -116,7 +116,7 @@

 #include "DRW_engine.h"

-#include "bmesh.h"
+#include "bmesh.hh"

 CurveMapping *BKE_sculpt_default_cavity_curve()

@@ -25,7 +25,7 @@
 #include "opensubdiv_capi.h"
 #include "opensubdiv_converter_capi.h"

-#include "bmesh_class.h"
+#include "bmesh_class.hh"

 /* Enable work-around for non-working CPU evaluator when using bilinear scheme.
 * This forces Catmark scheme with all edges marked as infinitely sharp. */
@@ -2,7 +2,7 @@
 *
 * SPDX-License-Identifier: GPL-2.0-or-later */

-/* Use a define instead of `#pragma once` because of `bmesh_iterators_inline.h` */
+/* Use a define instead of `#pragma once` because of `bmesh_iterators_inline.hh` */
 #ifndef __BLI_TASK_H__
 #define __BLI_TASK_H__

@@ -56,111 +56,111 @@ set(SRC
  operators/bmo_wireframe.cc

  intern/bmesh_callback_generic.cc
-  intern/bmesh_callback_generic.h
+  intern/bmesh_callback_generic.hh
  intern/bmesh_construct.cc
-  intern/bmesh_construct.h
+  intern/bmesh_construct.hh
  intern/bmesh_core.cc
-  intern/bmesh_core.h
+  intern/bmesh_core.hh
  intern/bmesh_delete.cc
-  intern/bmesh_delete.h
+  intern/bmesh_delete.hh
  intern/bmesh_edgeloop.cc
-  intern/bmesh_edgeloop.h
-  intern/bmesh_inline.h
+  intern/bmesh_edgeloop.hh
+  intern/bmesh_inline.hh
  intern/bmesh_interp.cc
-  intern/bmesh_interp.h
+  intern/bmesh_interp.hh
  intern/bmesh_iterators.cc
-  intern/bmesh_iterators.h
-  intern/bmesh_iterators_inline.h
+  intern/bmesh_iterators.hh
+  intern/bmesh_iterators_inline.hh
  intern/bmesh_log.cc
-  intern/bmesh_log.h
+  intern/bmesh_log.hh
  intern/bmesh_marking.cc
-  intern/bmesh_marking.h
+  intern/bmesh_marking.hh
  intern/bmesh_mesh.cc
-  intern/bmesh_mesh.h
+  intern/bmesh_mesh.hh
  intern/bmesh_mesh_convert.cc
-  intern/bmesh_mesh_convert.h
+  intern/bmesh_mesh_convert.hh
  intern/bmesh_mesh_debug.cc
-  intern/bmesh_mesh_debug.h
+  intern/bmesh_mesh_debug.hh
  intern/bmesh_mesh_duplicate.cc
-  intern/bmesh_mesh_duplicate.h
+  intern/bmesh_mesh_duplicate.hh
  intern/bmesh_mesh_normals.cc
-  intern/bmesh_mesh_normals.h
+  intern/bmesh_mesh_normals.hh
  intern/bmesh_mesh_partial_update.cc
-  intern/bmesh_mesh_partial_update.h
+  intern/bmesh_mesh_partial_update.hh
  intern/bmesh_mesh_tessellate.cc
-  intern/bmesh_mesh_tessellate.h
+  intern/bmesh_mesh_tessellate.hh
  intern/bmesh_mesh_validate.cc
-  intern/bmesh_mesh_validate.h
+  intern/bmesh_mesh_validate.hh
  intern/bmesh_mods.cc
-  intern/bmesh_mods.h
+  intern/bmesh_mods.hh
  intern/bmesh_opdefines.cc
-  intern/bmesh_operator_api_inline.h
+  intern/bmesh_operator_api_inline.hh
  intern/bmesh_operators.cc
-  intern/bmesh_operators.h
-  intern/bmesh_operators_private.h
+  intern/bmesh_operators.hh
+  intern/bmesh_operators_private.hh
  intern/bmesh_polygon.cc
-  intern/bmesh_polygon.h
+  intern/bmesh_polygon.hh
  intern/bmesh_polygon_edgenet.cc
-  intern/bmesh_polygon_edgenet.h
-  intern/bmesh_private.h
+  intern/bmesh_polygon_edgenet.hh
+  intern/bmesh_private.hh
  intern/bmesh_query.cc
-  intern/bmesh_query.h
-  intern/bmesh_query_inline.h
+  intern/bmesh_query.hh
+  intern/bmesh_query_inline.hh
  intern/bmesh_query_uv.cc
-  intern/bmesh_query_uv.h
+  intern/bmesh_query_uv.hh
  intern/bmesh_structure.cc
-  intern/bmesh_structure.h
-  intern/bmesh_structure_inline.h
+  intern/bmesh_structure.hh
+  intern/bmesh_structure_inline.hh
  intern/bmesh_walkers.cc
-  intern/bmesh_walkers.h
+  intern/bmesh_walkers.hh
  intern/bmesh_walkers_impl.cc
-  intern/bmesh_walkers_private.h
+  intern/bmesh_walkers_private.hh

-  intern/bmesh_error.h
-  intern/bmesh_operator_api.h
+  intern/bmesh_error.hh
+  intern/bmesh_operator_api.hh

  tools/bmesh_beautify.cc
-  tools/bmesh_beautify.h
+  tools/bmesh_beautify.hh
  tools/bmesh_bevel.cc
-  tools/bmesh_bevel.h
+  tools/bmesh_bevel.hh
  tools/bmesh_bisect_plane.cc
-  tools/bmesh_bisect_plane.h
+  tools/bmesh_bisect_plane.hh
  tools/bmesh_boolean.cc
-  tools/bmesh_boolean.h
-  tools/bmesh_decimate.h
+  tools/bmesh_boolean.hh
+  tools/bmesh_decimate.hh
  tools/bmesh_decimate_collapse.cc
  tools/bmesh_decimate_dissolve.cc
  tools/bmesh_decimate_unsubdivide.cc
  tools/bmesh_edgenet.cc
-  tools/bmesh_edgenet.h
+  tools/bmesh_edgenet.hh
  tools/bmesh_edgesplit.cc
-  tools/bmesh_edgesplit.h
+  tools/bmesh_edgesplit.hh
  tools/bmesh_intersect.cc
-  tools/bmesh_intersect.h
+  tools/bmesh_intersect.hh
  tools/bmesh_intersect_edges.cc
-  tools/bmesh_intersect_edges.h
+  tools/bmesh_intersect_edges.hh
  tools/bmesh_path.cc
-  tools/bmesh_path.h
+  tools/bmesh_path.hh
  tools/bmesh_path_region.cc
-  tools/bmesh_path_region.h
+  tools/bmesh_path_region.hh
  tools/bmesh_path_region_uv.cc
-  tools/bmesh_path_region_uv.h
+  tools/bmesh_path_region_uv.hh
  tools/bmesh_path_uv.cc
-  tools/bmesh_path_uv.h
+  tools/bmesh_path_uv.hh
  tools/bmesh_region_match.cc
-  tools/bmesh_region_match.h
+  tools/bmesh_region_match.hh
  tools/bmesh_separate.cc
-  tools/bmesh_separate.h
+  tools/bmesh_separate.hh
  tools/bmesh_triangulate.cc
-  tools/bmesh_triangulate.h
+  tools/bmesh_triangulate.hh
  tools/bmesh_wireframe.cc
-  tools/bmesh_wireframe.h
+  tools/bmesh_wireframe.hh

-  bmesh_class.h
+  bmesh_class.hh

  # public includes
-  bmesh.h
-  bmesh_tools.h
+  bmesh.hh
+  bmesh_tools.hh
 )

 set(LIB
@@ -67,7 +67,7 @@
 *
 * These are accessible through the iterator api, which is covered later in this document
 *
- * See source/blender/bmesh/bmesh_query.h for more misc. queries.
+ * See source/blender/bmesh/bmesh_query.hh for more misc. queries.
 * \section bm_api The BMesh API
 *
 * One of the goals of the BMesh API is to make it easy
@@ -76,12 +76,12 @@
 * \subsection bm_iter_api Iterator API
 *
 * Most topological queries in BMesh go through an iterator API (see Queries above).
- * These are defined in bmesh_iterators.h.
- * If you can, please use the #BM_ITER_MESH, #BM_ITER_ELEM macros in bmesh_iterators.h
+ * These are defined in bmesh_iterators.hh.
+ * If you can, please use the #BM_ITER_MESH, #BM_ITER_ELEM macros in bmesh_iterators.hh
 * \subsection bm_walker_api Walker API
 *
 * Topological queries that require a stack (e.g. recursive queries) go through the Walker API,
- * which is defined in bmesh_walkers.h. Currently the "walkers" are hard-coded into the API,
+ * which is defined in bmesh_walkers.hh. Currently the "walkers" are hard-coded into the API,
 * though a mechanism for plugging in new walkers needs to be added at some point.
 *
 * Most topological queries should go through these two APIs;
@@ -135,7 +135,7 @@
 * \subsection bm_slot_iter Slot Iterators
 *
 * Access to element buffers or maps must go through the slot iterator api,
- * defined in bmesh_operators.h.
+ * defined in bmesh_operators.hh.
 * Use #BMO_ITER where ever possible.
 * \subsection bm_elem_buf Element Buffers
 *
@@ -176,41 +176,41 @@
 */

 #include "BKE_customdata.hh"
-#include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.h uses */
+#include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.hh uses */
 #include "DNA_listBase.h"         /* selection history uses */

 #include <stdio.h>
 #include <stdlib.h>

-#include "bmesh_class.h"
+#include "bmesh_class.hh"

 /* include the rest of the API */
-#include "intern/bmesh_error.h"
-#include "intern/bmesh_operator_api.h"
+#include "intern/bmesh_error.hh"
+#include "intern/bmesh_operator_api.hh"

-#include "intern/bmesh_callback_generic.h"
-#include "intern/bmesh_construct.h"
-#include "intern/bmesh_core.h"
-#include "intern/bmesh_delete.h"
-#include "intern/bmesh_edgeloop.h"
-#include "intern/bmesh_interp.h"
-#include "intern/bmesh_iterators.h"
-#include "intern/bmesh_log.h"
-#include "intern/bmesh_marking.h"
-#include "intern/bmesh_mesh.h"
-#include "intern/bmesh_mesh_convert.h"
-#include "intern/bmesh_mesh_debug.h"
-#include "intern/bmesh_mesh_duplicate.h"
-#include "intern/bmesh_mesh_normals.h"
-#include "intern/bmesh_mesh_partial_update.h"
-#include "intern/bmesh_mesh_tessellate.h"
-#include "intern/bmesh_mesh_validate.h"
-#include "intern/bmesh_mods.h"
-#include "intern/bmesh_operators.h"
-#include "intern/bmesh_polygon.h"
-#include "intern/bmesh_polygon_edgenet.h"
-#include "intern/bmesh_query.h"
-#include "intern/bmesh_query_uv.h"
-#include "intern/bmesh_walkers.h"
+#include "intern/bmesh_callback_generic.hh"
+#include "intern/bmesh_construct.hh"
+#include "intern/bmesh_core.hh"
+#include "intern/bmesh_delete.hh"
+#include "intern/bmesh_edgeloop.hh"
+#include "intern/bmesh_interp.hh"
+#include "intern/bmesh_iterators.hh"
+#include "intern/bmesh_log.hh"
+#include "intern/bmesh_marking.hh"
+#include "intern/bmesh_mesh.hh"
+#include "intern/bmesh_mesh_convert.hh"
+#include "intern/bmesh_mesh_debug.hh"
+#include "intern/bmesh_mesh_duplicate.hh"
+#include "intern/bmesh_mesh_normals.hh"
+#include "intern/bmesh_mesh_partial_update.hh"
+#include "intern/bmesh_mesh_tessellate.hh"
+#include "intern/bmesh_mesh_validate.hh"
+#include "intern/bmesh_mods.hh"
+#include "intern/bmesh_operators.hh"
+#include "intern/bmesh_polygon.hh"
+#include "intern/bmesh_polygon_edgenet.hh"
+#include "intern/bmesh_query.hh"
+#include "intern/bmesh_query_uv.hh"
+#include "intern/bmesh_walkers.hh"

-#include "intern/bmesh_inline.h"
+#include "intern/bmesh_inline.hh"
@@ -13,10 +13,6 @@

 #include "BLI_assert.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* disable holes for now,
 * these are ifdef'd because they use more memory and can't be saved in DNA currently */
 // #define USE_BMESH_HOLES
@@ -674,7 +670,3 @@ typedef bool (*BMLoopPairFilterFunc)(const BMLoop *, const BMLoop *, void *user_
 #else
 #  define BM_OMP_LIMIT 10000
 #endif
-
-#ifdef __cplusplus
-}
-#endif
@@ -1,27 +0,0 @@
-/* SPDX-FileCopyrightText: 2023 Blender Authors
- *
- * SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-/** \file
- * \ingroup bmesh
- *
- * Utility functions that operate directly on the BMesh,
- * These can be used by both Modifiers and BMesh-Operators.
- */
-
-#include "tools/bmesh_beautify.h"
-#include "tools/bmesh_bevel.h"
-#include "tools/bmesh_bisect_plane.h"
-#include "tools/bmesh_boolean.h"
-#include "tools/bmesh_decimate.h"
-#include "tools/bmesh_edgenet.h"
-#include "tools/bmesh_edgesplit.h"
-#include "tools/bmesh_path.h"
-#include "tools/bmesh_path_region.h"
-#include "tools/bmesh_path_region_uv.h"
-#include "tools/bmesh_path_uv.h"
-#include "tools/bmesh_region_match.h"
-#include "tools/bmesh_separate.h"
-#include "tools/bmesh_triangulate.h"
@@ -0,0 +1,27 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+/** \file
+ * \ingroup bmesh
+ *
+ * Utility functions that operate directly on the BMesh,
+ * These can be used by both Modifiers and BMesh-Operators.
+ */
+
+#include "tools/bmesh_beautify.hh"
+#include "tools/bmesh_bevel.hh"
+#include "tools/bmesh_bisect_plane.hh"
+#include "tools/bmesh_boolean.hh"
+#include "tools/bmesh_decimate.hh"
+#include "tools/bmesh_edgenet.hh"
+#include "tools/bmesh_edgesplit.hh"
+#include "tools/bmesh_path.hh"
+#include "tools/bmesh_path_region.hh"
+#include "tools/bmesh_path_region_uv.hh"
+#include "tools/bmesh_path_uv.hh"
+#include "tools/bmesh_region_match.hh"
+#include "tools/bmesh_separate.hh"
+#include "tools/bmesh_triangulate.hh"
@@ -10,9 +10,9 @@

 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_callback_generic.h"
+#include "intern/bmesh_callback_generic.hh"

 bool BM_elem_cb_check_hflag_ex(BMElem *ele, void *user_data)
 {
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 bool BM_elem_cb_check_hflag_enabled(BMElem *, void *user_data);
 bool BM_elem_cb_check_hflag_disabled(BMElem *, void *user_data);
 bool BM_elem_cb_check_hflag_ex(BMElem *, void *user_data);
@@ -26,7 +22,3 @@ bool BM_elem_cb_check_elem_not_equal(BMElem *ele, void *user_data);

 #define BM_elem_cb_check_hflag_disabled_simple(type, hflag_n) \
  (bool (*)(type, void *)) BM_elem_cb_check_hflag_disabled, POINTER_FROM_UINT(hflag_n)
-
-#ifdef __cplusplus
-}
-#endif
@@ -20,8 +20,8 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 bool BM_verts_from_edges(BMVert **vert_arr, BMEdge **edge_arr, const int len)
 {
@@ -8,15 +8,11 @@
 * \ingroup bmesh
 */

-#include "bmesh_core.h"
+#include "bmesh_core.hh"

 struct BMAllocTemplate;
 struct Mesh;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Fill in a vertex array from an edge array.
 *
@@ -171,7 +167,3 @@ void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst,
                                             char htype,
                                             const struct BMAllocTemplate *allocsize);
 BMesh *BM_mesh_copy(BMesh *bm_old);
-
-#ifdef __cplusplus
-}
-#endif
@@ -23,8 +23,8 @@
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 using blender::Vector;

@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 BMFace *BM_face_copy(BMesh *bm_dst, BMesh *bm_src, BMFace *f, bool copy_verts, bool copy_edges);

 typedef enum eBMCreateFlag {
@@ -397,7 +393,3 @@ BMVert *bmesh_kernel_unglue_region_make_vert_multi(BMesh *bm, BMLoop **larr, int
 * isolated by calling #bmesh_kernel_edge_separate to segregate it radially.
 */
 BMVert *bmesh_kernel_unglue_region_make_vert_multi_isolated(BMesh *bm, BMLoop *l_sep);
-
-#ifdef __cplusplus
-}
-#endif
@@ -10,8 +10,8 @@

 #include "BLI_utildefines.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 /* BMO functions */

@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void BMO_mesh_delete_oflag_tagged(BMesh *bm, short oflag, char htype);
 void BM_mesh_delete_hflag_tagged(BMesh *bm, char hflag, char htype);

@@ -25,7 +21,3 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, short oflag, int type);
 * not just the type being removed.
 */
 void BM_mesh_delete_hflag_context(BMesh *bm, char hflag, int type);
-
-#ifdef __cplusplus
-}
-#endif
@@ -16,9 +16,9 @@
 #include "BLI_stack.h"
 #include "BLI_utildefines_iter.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "bmesh_edgeloop.h" /* own include */
+#include "bmesh_edgeloop.hh" /* own include */

 struct BMEdgeLoopStore {
  BMEdgeLoopStore *next, *prev;
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BMEdgeLoopStore;
 struct GSet;
 struct ListBase;
@@ -86,7 +82,3 @@ bool BM_edgeloop_overlap_check(struct BMEdgeLoopStore *el_store_a,
 #define BM_EDGELOOP_NEXT(el_store) \
  (CHECK_TYPE_INLINE(el_store, struct BMEdgeLoopStore *), \
   (struct BMEdgeLoopStore *)((LinkData *)el_store)->next)
-
-#ifdef __cplusplus
-}
-#endif
@@ -8,11 +8,7 @@
 * \ingroup bmesh
 */

-#include "bmesh_operator_api.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "bmesh_operator_api.hh"

 /*----------- bmop error system ----------*/

@@ -93,7 +89,3 @@ void BMO_error_clear(BMesh *bm);
                    _BMESH_DUMMY_ABORT(), \
                    NULL)) : \
                  NULL)
-
-#ifdef __cplusplus
-}
-#endif
@@ -10,10 +10,6 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* stuff for dealing with header flags */
 #define BM_elem_flag_test(ele, hflag) _bm_elem_flag_test(&(ele)->head, hflag)
 #define BM_elem_flag_test_bool(ele, hflag) _bm_elem_flag_test_bool(&(ele)->head, hflag)
@@ -126,7 +122,3 @@ BLI_INLINE int _bm_elem_index_get(const BMHeader *head)
 {
  return head->index;
 }
-
-#ifdef __cplusplus
-}
-#endif
@@ -25,8 +25,8 @@
 #include "BKE_customdata.hh"
 #include "BKE_multires.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 /* edge and vertex share, currently there's no need to have different logic */
 static void bm_data_interp_from_elem(CustomData *data_layer,
@@ -11,10 +11,6 @@
 struct LinkNode;
 struct MemArena;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void BM_loop_interp_multires_ex(BMesh *bm,
                                BMLoop *l_dst,
                                const BMFace *f_src,
@@ -128,7 +124,3 @@ void BM_vert_loop_groups_data_layer_merge_weights(BMesh *bm,
                                                  struct LinkNode *groups,
                                                  int layer_n,
                                                  const float *loop_weights);
-
-#ifdef __cplusplus
-}
-#endif
@@ -15,8 +15,8 @@
 #include "BLI_bitmap.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 const char bm_iter_itype_htype_map[BM_ITYPE_MAX] = {
    '\0',
@@ -19,17 +19,10 @@
 * of inspecting the structure directly.
 */

+#include "BLI_bit_span.hh"
 #include "BLI_compiler_attrs.h"
 #include "BLI_mempool.h"

-#ifdef __cplusplus
-#  include "BLI_bit_span.hh"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* these iterator over all elements of a specific
 * type in the mesh.
 *
@@ -287,11 +280,7 @@ BMITER_CB_DEF(loop_of_face);

 #undef BMITER_CB_DEF

-#ifdef __cplusplus
-}
-#endif
-
-#include "intern/bmesh_iterators_inline.h"
+#include "intern/bmesh_iterators_inline.hh"

 #define BM_ITER_CHECK_TYPE_DATA(data) \
  CHECK_TYPE_ANY(data, void *, BMFace *, BMEdge *, BMVert *, BMLoop *, BMElem *)
@@ -10,10 +10,6 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* inline here optimizes out the switch statement when called with
 * constant values (which is very common), nicer for loop-in-loop situations */

@@ -201,7 +197,3 @@ BLI_INLINE void BM_iter_parallel(BMesh *bm,
 }

 #endif /* __BLI_TASK_H__ */
-
-#ifdef __cplusplus
-}
-#endif
@@ -27,8 +27,8 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
-#include "bmesh_log.h"
+#include "bmesh.hh"
+#include "bmesh_log.hh"
 #include "range_tree.h"

 #include "BLI_strict_flags.h"
@@ -16,10 +16,6 @@ struct RangeTreeUInt;
 typedef struct BMLog BMLog;
 typedef struct BMLogEntry BMLogEntry;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Allocate, initialize, and assign a new BMLog.
 */
@@ -215,7 +211,3 @@ BMLogEntry *BM_log_current_entry(BMLog *log);
 struct RangeTreeUInt *BM_log_unused_ids(BMLog *log);

 void BM_log_print_entry(BMesh *bm, BMLogEntry *entry);
-
-#ifdef __cplusplus
-}
-#endif
@@ -23,11 +23,11 @@
 #include "BLI_math_vector.h"
 #include "BLI_task.h"

-#include "bmesh.h"
-#include "bmesh_structure.h"
+#include "bmesh.hh"
+#include "bmesh_structure.hh"

 /* For '_FLAG_OVERLAP'. */
-#include "bmesh_private.h"
+#include "bmesh_private.hh"

 /* -------------------------------------------------------------------- */
 /** \name Recounting total selection.
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct BMEditSelection {
  struct BMEditSelection *next, *prev;
  BMElem *ele;
@@ -194,7 +190,3 @@ void BM_select_history_merge_from_targetmap(
  (bm)->selected = _bm_prev_selected; \
  } \
  (void)0
-
-#ifdef __cplusplus
-}
-#endif
@@ -21,7 +21,7 @@
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

 const BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512};
 const BMAllocTemplate bm_mesh_chunksize_default = {512, 1024, 2048, 512};
@@ -8,11 +8,7 @@
 * \ingroup bmesh
 */

-#include "bmesh_class.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "bmesh_class.hh"

 struct BMAllocTemplate;

@@ -208,7 +204,3 @@ void BM_mesh_vert_coords_apply(BMesh *bm, const float (*vert_coords)[3]);
 void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm,
                                         const float (*vert_coords)[3],
                                         const float mat[4][4]);
-
-#ifdef __cplusplus
-}
-#endif
@@ -101,8 +101,8 @@

 #include "DEG_depsgraph_query.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h" /* For element checking. */
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh" /* For element checking. */

 #include "CLG_log.h"

@@ -8,21 +8,15 @@
 * \ingroup bmesh
 */

-#include "bmesh.h"
+#include "BLI_string_ref.hh"

-#ifdef __cplusplus
-#  include "BLI_string_ref.hh"
+#include "bmesh.hh"

 /**
 * \return Whether attributes with the given name are stored in special flags or fields in BMesh
 * rather than in the regular custom data blocks.
 */
 bool BM_attribute_stored_in_bmesh_builtin(const blender::StringRef name);
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif

 struct CustomData_MeshMasks;
 struct Main;
@@ -101,7 +95,3 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm,
                               struct Mesh *me,
                               const struct CustomData_MeshMasks *cd_mask_extra)
    ATTR_NONNULL(1, 2);
-
-#ifdef __cplusplus
-}
-#endif
@@ -21,9 +21,9 @@

 #  include "BKE_customdata.hh"

-#  include "bmesh.h"
+#  include "bmesh.hh"

-#  include "bmesh_mesh_debug.h"
+#  include "bmesh_mesh_debug.hh"

 #  include "BLI_dynstr.h"

@@ -10,17 +10,9 @@

 #include "BLI_compiler_attrs.h"

-#include "bmesh.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "bmesh.hh"

 #ifndef NDEBUG
 char *BM_mesh_debug_info(BMesh *bm) ATTR_NONNULL(1) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT;
 void BM_mesh_debug_print(BMesh *bm) ATTR_NONNULL(1);
 #endif /* NDEBUG */
-
-#ifdef __cplusplus
-}
-#endif
@@ -15,8 +15,8 @@
 #include "BLI_alloca.h"
 #include "BLI_math_vector.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h" /* for element checking */
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh" /* for element checking */

 static BMVert *bm_vert_copy(BMesh *bm_src, BMesh *bm_dst, BMVert *v_src)
 {
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Geometry must be completely isolated.
 */
@@ -23,7 +19,3 @@ void BM_mesh_copy_arrays(BMesh *bm_src,
                         uint edges_src_len,
                         BMFace **faces_src,
                         uint faces_src_len);
-
-#ifdef __cplusplus
-}
-#endif
@@ -27,7 +27,7 @@
 #include "BKE_global.h"
 #include "BKE_mesh.hh"

-#include "intern/bmesh_private.h"
+#include "intern/bmesh_private.hh"

 /* Smooth angle to use when tagging edges is disabled entirely. */
 #define EDGE_TAG_FROM_SPLIT_ANGLE_BYPASS -FLT_MAX
@@ -8,11 +8,7 @@
 * \ingroup bmesh
 */

-#include "bmesh_class.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "bmesh_class.hh"

 struct BMPartialUpdate;

@@ -106,7 +102,3 @@ void BM_custom_loop_normals_from_vector_layer(struct BMesh *bm, bool add_sharp_e
 * to keep same shading as with auto-smooth!
 */
 void BM_edges_sharp_from_angle_set(BMesh *bm, float split_angle);
-
-#ifdef __cplusplus
-}
-#endif
@@ -43,7 +43,7 @@
 #include "BLI_bitmap.h"
 #include "BLI_math_vector.h"

-#include "bmesh.h"
+#include "bmesh.hh"

 /**
 * Grow by 1.5x (rounding up).
@@ -10,10 +10,6 @@

 #include "BLI_compiler_attrs.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Parameters used to determine which kinds of data needs to be generated.
 */
@@ -89,7 +85,3 @@ BMPartialUpdate *BM_mesh_partial_create_from_verts_group_multi(
    ATTR_NONNULL(1, 2, 3) ATTR_WARN_UNUSED_RESULT;

 void BM_mesh_partial_destroy(BMPartialUpdate *bmpinfo) ATTR_NONNULL(1);
-
-#ifdef __cplusplus
-}
-#endif
@@ -25,8 +25,8 @@
 #include "BLI_polyfill_2d_beautify.h"
 #include "BLI_task.h"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

 /**
 * On systems with 32+ cores,
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BMPartialUpdate;

 struct BMeshCalcTessellation_Params {
@@ -39,7 +35,3 @@ void BM_mesh_calc_tessellation_with_partial_ex(BMesh *bm,
 void BM_mesh_calc_tessellation_with_partial(BMesh *bm,
                                            BMLoop *(*looptris)[3],
                                            const struct BMPartialUpdate *bmpinfo);
-
-#ifdef __cplusplus
-}
-#endif
@@ -16,9 +16,9 @@
 #  include "BLI_set.hh"
 #  include "BLI_utildefines.h"

-#  include "bmesh.h"
+#  include "bmesh.hh"

-#  include "bmesh_mesh_validate.h"
+#  include "bmesh_mesh_validate.hh"

 /* macro which inserts the function name */
 #  if defined __GNUC__
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Check of this #BMesh is valid,
 * this function can be slow since its intended to help with debugging.
@@ -19,7 +15,3 @@ extern "C" {
 * \return true when the mesh is valid.
 */
 bool BM_mesh_validate(BMesh *bm);
-
-#ifdef __cplusplus
-}
-#endif
@@ -16,8 +16,8 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 using blender::Vector;

@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * \brief Dissolve Vert
 *
@@ -59,7 +55,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v);
 */
 BMFace *BM_faces_join_pair(BMesh *bm, BMLoop *l_a, BMLoop *l_b, bool do_del);

-/** see: bmesh_polygon_edgenet.h for #BM_face_split_edgenet */
+/** see: bmesh_polygon_edgenet.hh for #BM_face_split_edgenet */

 /**
 * \brief Face Split
@@ -264,7 +260,3 @@ enum {
 BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *l_sep);
 BMVert *BM_face_loop_separate_multi_isolated(BMesh *bm, BMLoop *l_sep);
 BMVert *BM_face_loop_separate_multi(BMesh *bm, BMLoop **larr, int larr_len);
-
-#ifdef __cplusplus
-}
-#endif
@@ -37,8 +37,8 @@

 #include "BLI_utildefines.h"

-#include "bmesh.h"
-#include "intern/bmesh_operators_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_operators_private.hh"

 #include "DNA_modifier_types.h"

@@ -12,10 +12,6 @@

 #include <stdarg.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * operators represent logical, executable mesh modules.  all topological
 * operations involving a bmesh has to go through them.
@@ -31,8 +27,8 @@ extern "C" {
 *
 * each slot is identified by a slot code, as are each operator.
 * operators, and their slots, are defined in bmesh_opdefines.cc (with their
- * execution functions prototyped in bmesh_operators_private.h), with all their
- * operator code and slot codes defined in bmesh_operators.h.  see
+ * execution functions prototyped in bmesh_operators_private.hh), with all their
+ * operator code and slot codes defined in bmesh_operators.hh.  see
 * bmesh_opdefines.cc and the BMOpDefine struct for how to define new operators.
 *
 * in general, operators are fed arrays of elements, created using either
@@ -49,7 +45,7 @@ extern "C" {
 *
 * \note when you read from an element slot array or mapping, you can either tool-flag
 * all the elements in it, or read them using an iterator API (which is semantically
- * similar to the iterator api in bmesh_iterators.h).
+ * similar to the iterator api in bmesh_iterators.hh).
 *
 * \note only #BMLoop items can't be put into slots as with verts, edges & faces.
 */
@@ -834,7 +830,3 @@ bool BMO_iter_map_value_bool(BMOIter *iter);
 extern const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES];

 int BMO_opcode_from_opname(const char *opname);
-
-#ifdef __cplusplus
-}
-#endif
@@ -10,10 +10,6 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Tool Flag API: Tool code must never put junk in header flags (#BMHeader.hflag)
 * instead, use this API to set flags.
 * If you need to store a value per element, use a #GHash or a mapping slot to do it. */
@@ -222,7 +218,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE

  return NULL;
 }
-
-#ifdef __cplusplus
-}
-#endif
@@ -20,8 +20,8 @@

 #include "BLT_translation.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 /* forward declarations */
 static void bmo_flag_layer_alloc(BMesh *bm);
@@ -10,10 +10,6 @@

 /* See comments in `intern/bmesh_opdefines.cc` for documentation of specific operators. */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*--------defines/enumerations for specific operators-------*/

 /* Quad `innervert` values. */
@@ -219,8 +215,4 @@ void BM_mesh_calc_uvs_cone(BMesh *bm,
 */
 void BM_mesh_calc_uvs_cube(BMesh *bm, short oflag);

-#include "intern/bmesh_operator_api_inline.h"
-
-#ifdef __cplusplus
-}
-#endif
+#include "intern/bmesh_operator_api_inline.hh"
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BMOperator;
 struct BMesh;

@@ -95,7 +91,3 @@ void bmo_unsubdivide_exec(BMesh *bm, BMOperator *op);
 void bmo_weld_verts_exec(BMesh *bm, BMOperator *op);
 void bmo_wireframe_exec(BMesh *bm, BMOperator *op);
 void bmo_flip_quad_tessellation_exec(BMesh *bm, BMOperator *op);
-
-#ifdef __cplusplus
-}
-#endif
@@ -26,12 +26,12 @@
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

 #include "BKE_customdata.hh"

-#include "intern/bmesh_private.h"
+#include "intern/bmesh_private.hh"

 /**
 * \brief COMPUTE POLY NORMAL (BMFace)
@@ -12,10 +12,6 @@ struct Heap;

 #include "BLI_compiler_attrs.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * For tools that insist on using triangles, ideally we would cache this data.
 *
@@ -288,7 +284,3 @@ void BM_vert_tri_calc_tangent_edge(BMVert *verts[3], float r_tangent[3]);
 * \param r_tangent: Calculated unit length tangent (return value).
 */
 void BM_vert_tri_calc_tangent_edge_pair(BMVert *verts[3], float r_tangent[3]);
-
-#ifdef __cplusplus
-}
-#endif
@@ -25,8 +25,8 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 /* -------------------------------------------------------------------- */
 /** \name Face Split Edge-Net
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Splits a face into many smaller faces defined by an edge-net.
 * handle customdata and degenerate cases.
@@ -44,7 +40,3 @@ bool BM_face_split_edgenet_connect_islands(BMesh *bm,
                                           BMEdge ***r_edge_net_new,
                                           uint *r_edge_net_new_len) ATTR_WARN_UNUSED_RESULT
    ATTR_NONNULL(1, 2, 3, 6, 7, 8);
-
-#ifdef __cplusplus
-}
-#endif
@@ -12,10 +12,6 @@
 * parts of the bmesh internals.
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* returns positive nonzero on error */

 #ifdef NDEBUG
@@ -90,8 +86,4 @@ enum {
 void poly_rotate_plane(const float normal[3], float (*verts)[3], uint nverts);

 /* include the rest of our private declarations */
-#include "bmesh_structure.h"
-
-#ifdef __cplusplus
-}
-#endif
+#include "bmesh_structure.hh"
@@ -25,8 +25,8 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 BMLoop *BM_face_other_edge_loop(BMFace *f, BMEdge *e, BMVert *v)
 {
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Returns true if the vertex is used in a given face.
 */
@@ -776,8 +772,4 @@ int BM_mesh_calc_edge_groups_as_arrays(BMesh *bm,
 /* Not really any good place to put this. */
 float bmesh_subd_falloff_calc(int falloff, float val) ATTR_WARN_UNUSED_RESULT;

-#ifdef __cplusplus
-}
-#endif
-
-#include "bmesh_query_inline.h"
+#include "bmesh_query_inline.hh"
@@ -8,10 +8,6 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Returns whether or not a given vertex is
 * is part of a given edge.
@@ -143,7 +139,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE bool BM_vert_is_wire_endpoint
  }
  return false;
 }
-
-#ifdef __cplusplus
-}
-#endif
@@ -20,8 +20,8 @@

 #include "DNA_meshdata_types.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 BMUVOffsets BM_uv_map_get_offsets_from_layer(const BMesh *bm, const int layer)
 {
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
 * Retrieve the custom data offsets for the UV map.
 * \param layer: The layer index (where 0 is the first UV map).
@@ -86,7 +82,3 @@ bool BM_loop_uv_share_vert_check(BMLoop *l_a,
 bool BM_face_uv_point_inside_test(const BMFace *f,
                                  const float co[2],
                                  int cd_loop_uv_offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-
-#ifdef __cplusplus
-}
-#endif
@@ -10,8 +10,8 @@

 #include "BLI_utildefines.h"

-#include "bmesh.h"
-#include "intern/bmesh_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_private.hh"

 /**
 * MISC utility functions.
@@ -15,10 +15,6 @@
 * descriptive comments.  but seriously, don't use this stuff.
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* LOOP CYCLE MANAGEMENT */
 /*****loop cycle functions, e.g. loops surrounding a face**** */
 bool bmesh_loop_validate(BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
@@ -139,8 +135,4 @@ BMEdge *bmesh_disk_edge_exists(const BMVert *v1, const BMVert *v2) ATTR_WARN_UNU
    ATTR_NONNULL();
 bool bmesh_disk_validate(int len, BMEdge *e, BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();

-#ifdef __cplusplus
-}
-#endif
-
-#include "intern/bmesh_structure_inline.h"
+#include "intern/bmesh_structure_inline.hh"
@@ -10,10 +10,6 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2)
    BLI_INLINE BMDiskLink *bmesh_disk_edge_link_from_vert(const BMEdge *e, const BMVert *v)
 {
@@ -63,7 +59,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE BMEdge *bmesh_disk_edge_pr
 {
  return BM_DISK_EDGE_PREV(e, v);
 }
-
-#ifdef __cplusplus
-}
-#endif
@@ -33,9 +33,9 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "bmesh_walkers_private.h"
+#include "bmesh_walkers_private.hh"

 void *BMW_begin(BMWalker *walker, void *start)
 {
@@ -8,10 +8,6 @@
 * \ingroup bmesh
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
 * NOTE: do NOT modify topology while walking a mesh!
 */
@@ -174,7 +170,3 @@ enum {

 /* use with BMW_init, so as not to confuse with restrict flags */
 #define BMW_NIL_LAY 0
-
-#ifdef __cplusplus
-}
-#endif
@@ -14,8 +14,8 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
-#include "intern/bmesh_walkers_private.h"
+#include "bmesh.hh"
+#include "intern/bmesh_walkers_private.hh"

 /* Pop into stack memory (common operation). */
 #define BMW_state_remove_r(walker, owalk) \
@@ -10,10 +10,6 @@
 * BMesh walker API.
 */

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern BMWalker *bm_walker_types[];
 extern const int bm_totwalkers;

@@ -92,7 +88,3 @@ typedef struct BMwConnectedVertexWalker {
  BMwGenericWalker header;
  BMVert *curvert;
 } BMwConnectedVertexWalker;
-
-#ifdef __cplusplus
-}
-#endif
@@ -11,9 +11,9 @@

 #include "MEM_guardedalloc.h"

-#include "bmesh.h"
-#include "bmesh_tools.h"
-#include "intern/bmesh_operators_private.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"
+#include "intern/bmesh_operators_private.hh"

 #define ELE_NEW 1
 #define FACE_MARK 2
@@ -12,10 +12,10 @@

 #include "BKE_curveprofile.h"
 #include "DNA_curveprofile_types.h"
-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 void bmo_bevel_exec(BMesh *bm, BMOperator *op)
 {
@@ -15,10 +15,10 @@
 #include "BLI_utildefines.h"
 #include "BLI_utildefines_stack.h"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define ELE_NEW 1
 #define ELE_CUT 2
@@ -12,9 +12,9 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 /**
 * TODO(@ideasman42): Many connected edge loops can cause an error attempting
@@ -13,9 +13,9 @@
 #include "BLI_utildefines.h"
 #include "BLI_utildefines_stack.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define VERT_INPUT 1

@@ -28,9 +28,9 @@
 #include "BLI_polyfill_2d_beautify.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define EDGE_OUT (1 << 0)
 #define FACE_OUT (1 << 1)
@@ -13,9 +13,9 @@
 #include "BLI_math_geom.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define EDGE_OUT (1 << 0)
 #define FACE_OUT (1 << 1)
@@ -15,9 +15,9 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #include "BLI_mempool.h"

@@ -12,9 +12,9 @@

 #include "BLI_listbase.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define ELE_NEW 1
 #define ELE_OUT 2
@@ -14,10 +14,10 @@
 #include "BLI_stack.h"
 #include "BLI_vector.hh"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

-#include "intern/bmesh_operators_private.h"
+#include "intern/bmesh_operators_private.hh"

 using blender::Vector;

@@ -15,9 +15,9 @@
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 /* local flag define */
 #define DUPE_INPUT 1 /* input from operator */
@@ -13,10 +13,10 @@
 #include "BLI_math_vector.h"
 #include "BLI_vector.hh"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 using blender::Vector;

@@ -18,9 +18,9 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define USE_EDGE_REGION_FLAGS

@@ -11,9 +11,9 @@
 #include "BLI_linklist_stack.h"
 #include "BLI_utildefines.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 /**
 * Check if all other loops are tagged.
@@ -12,9 +12,9 @@

 #include "BLI_listbase.h"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #define VERT_USED 1
 #define EDGE_MARK 2
@@ -16,9 +16,9 @@

 #include "BKE_customdata.hh"

-#include "bmesh.h"
+#include "bmesh.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 #include "BLI_strict_flags.h"

@@ -10,10 +10,10 @@

 #include "BLI_utildefines.h"

-#include "bmesh.h"
-#include "bmesh_tools.h"
+#include "bmesh.hh"
+#include "bmesh_tools.hh"

-#include "intern/bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.hh" /* own include */

 void bmo_holes_fill_exec(BMesh *bm, BMOperator *op)
 {
--- a/Show More
+++ b/Show More