Cleanup: Move mesh related blenkernel headers to C++

See #103343

Pull Request: https://projects.blender.org/blender/blender/pulls/110730

scripts/startup/bl_ui/space_view3d.py

@@ -765,7 +765,6 @@ class VIEW3D_HT_header(Header):
                     depress=(tool_settings.gpencil_selectmode_edit == 'STROKE'),
                 ).mode = 'STROKE'
 
-
             if object_mode == 'PAINT_GREASE_PENCIL':
                 row = layout.row()
                 sub = row.row(align=True)

source/blender/blenkernel/BKE_brush.hh

@@ -13,11 +13,7 @@
 #include "DNA_color_types.h"
 #include "DNA_object_enums.h"
 
-#include "BKE_paint.h" /* for ePaintMode */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BKE_paint.hh" /* for ePaintMode */
 
 struct Brush;
 struct ImBuf;
@@ -207,7 +203,3 @@ bool BKE_brush_has_cube_tip(const struct Brush *brush, ePaintMode paint_mode);
 
 /* debugging only */
 void BKE_brush_debug_print_state(struct Brush *br);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh.h

@@ -15,7 +15,6 @@
 #include "DNA_meshdata_types.h"
 
 #include "BKE_customdata.h"
-#include "BKE_mesh_types.h"
 
 struct BMesh;
 struct BMeshCreateParams;
@@ -42,6 +41,16 @@ struct Scene;
 extern "C" {
 #endif
 
+/* TODO: Move to `BKE_mesh_types.hh` when possible. */
+typedef enum eMeshBatchDirtyMode {
+  BKE_MESH_BATCH_DIRTY_ALL = 0,
+  BKE_MESH_BATCH_DIRTY_SELECT,
+  BKE_MESH_BATCH_DIRTY_SELECT_PAINT,
+  BKE_MESH_BATCH_DIRTY_SHADING,
+  BKE_MESH_BATCH_DIRTY_UVEDIT_ALL,
+  BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT,
+} eMeshBatchDirtyMode;
+
 /*  mesh_runtime.cc  */
 
 /**

source/blender/blenkernel/BKE_mesh.hh

@@ -11,6 +11,7 @@
 #include "BLI_index_mask.hh"
 
 #include "BKE_mesh.h"
+#include "BKE_mesh_types.hh"
 
 namespace blender::bke {
 namespace mesh {

source/blender/blenkernel/BKE_mesh_fair.hh

@@ -12,10 +12,6 @@
 
 #include "BLI_utildefines.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Mesh Fairing. */
 /* Creates a smooth as possible geometry patch in a defined area. Different values of depth allow
  * to minimize changes in the vertex positions or tangency in the affected area. */
@@ -41,7 +37,3 @@ void BKE_mesh_prefair_and_fair_verts(struct Mesh *mesh,
                                      float (*deform_vert_positions)[3],
                                      bool *affect_verts,
                                      eMeshFairingDepth depth);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_iterators.hh

@@ -7,10 +7,6 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 
 typedef enum MeshForeachFlag {
@@ -56,7 +52,3 @@ void BKE_mesh_foreach_mapped_subdiv_face_center(
 void BKE_mesh_foreach_mapped_vert_coords_get(const struct Mesh *me_eval,
                                              float (*r_cos)[3],
                                              int totcos);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_legacy_convert.hh

@@ -8,19 +8,14 @@
  * \ingroup bke
  */
 
+#include "BLI_resource_scope.hh"
+#include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
-#ifdef __cplusplus
-#  include "BLI_resource_scope.hh"
-#  include "BLI_span.hh"
-#endif
-
 struct CustomData;
 struct Mesh;
 struct MFace;
 
-#ifdef __cplusplus
-
 void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh);
 
 /**
@@ -79,12 +74,6 @@ void BKE_mesh_legacy_convert_loops_to_corners(struct Mesh *mesh);
 
 void BKE_mesh_legacy_face_map_to_generic(struct Mesh *mesh);
 
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Recreate #MFace Tessellation.
  */
@@ -133,7 +122,3 @@ BLI_INLINE int BKE_mesh_origindex_mface_mpoly(const int *index_mf_to_mpoly,
   const int j = index_mf_to_mpoly[i];
   return (j != -1) ? (index_mp_to_orig ? index_mp_to_orig[j] : j) : -1;
 }
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_mapping.hh

@@ -7,15 +7,9 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-#  include "BLI_array.hh"
-#  include "BLI_math_vector_types.hh"
-#  include "BLI_offset_indices.hh"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BLI_array.hh"
+#include "BLI_math_vector_types.hh"
+#include "BLI_offset_indices.hh"
 
 struct MLoopTri;
 
@@ -100,8 +94,6 @@ typedef struct MeshElemMap {
   int count;
 } MeshElemMap;
 
-#ifdef __cplusplus
-
 /* mapping */
 
 UvVertMap *BKE_mesh_uv_vert_map_create(blender::OffsetIndices<int> faces,
@@ -114,13 +106,9 @@ UvVertMap *BKE_mesh_uv_vert_map_create(blender::OffsetIndices<int> faces,
                                        bool selected,
                                        bool use_winding);
 
-#endif
-
 UvMapVert *BKE_mesh_uv_vert_map_get_vert(UvVertMap *vmap, unsigned int v);
 void BKE_mesh_uv_vert_map_free(UvVertMap *vmap);
 
-#ifdef __cplusplus
-
 /**
  * Generates a map where the key is the edge and the value
  * is a list of looptris that use that edge.
@@ -255,10 +243,6 @@ bool BKE_mesh_calc_islands_loop_face_uvmap(float (*vert_positions)[3],
                                            const float (*luvs)[2],
                                            MeshIslandStore *r_island_store);
 
-#  ifdef __cplusplus
-}
-#  endif
-
 /**
  * Calculate smooth groups from sharp edges.
  *
@@ -276,14 +260,14 @@ int *BKE_mesh_calc_smoothgroups(int edges_num,
                                 bool use_bitflags);
 
 /* use on looptri vertex values */
-#  define BKE_MESH_TESSTRI_VINDEX_ORDER(_tri, _v) \
-    ((CHECK_TYPE_ANY( \
-          _tri, unsigned int *, int *, int[3], const unsigned int *, const int *, const int[3]), \
-      CHECK_TYPE_ANY(_v, unsigned int, const unsigned int, int, const int)), \
-     (((_tri)[0] == _v) ? 0 : \
-      ((_tri)[1] == _v) ? 1 : \
-      ((_tri)[2] == _v) ? 2 : \
-                          -1))
+#define BKE_MESH_TESSTRI_VINDEX_ORDER(_tri, _v) \
+  ((CHECK_TYPE_ANY( \
+        _tri, unsigned int *, int *, int[3], const unsigned int *, const int *, const int[3]), \
+    CHECK_TYPE_ANY(_v, unsigned int, const unsigned int, int, const int)), \
+   (((_tri)[0] == _v) ? 0 : \
+    ((_tri)[1] == _v) ? 1 : \
+    ((_tri)[2] == _v) ? 2 : \
+                        -1))
 
 namespace blender::bke::mesh {
 
@@ -317,4 +301,3 @@ GroupedSpan<int> build_edge_to_face_map(OffsetIndices<int> faces,
                                         Array<int> &r_indices);
 
 }  // namespace blender::bke::mesh
-#endif

source/blender/blenkernel/BKE_mesh_mirror.hh

@@ -8,10 +8,6 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Main;
 struct Mesh;
 struct MirrorModifierData;
@@ -39,7 +35,3 @@ struct Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(struct MirrorModi
                                                                bool use_correct_order_on_merge,
                                                                int **r_vert_merge_map,
                                                                int *r_vert_merge_map_len);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_remap.hh

@@ -8,13 +8,10 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-#  include "BLI_offset_indices.hh"
-#endif
+#include "BLI_math_vector_types.hh"
+#include "BLI_offset_indices.hh"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BKE_mesh_mapping.hh"
 
 struct CustomData;
 struct CustomData_MeshMasks;
@@ -186,12 +183,6 @@ void BKE_mesh_remap_calc_verts_from_mesh(int mode,
                                          struct Mesh *me_dst,
                                          MeshPairRemap *r_map);
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-
 void BKE_mesh_remap_calc_edges_from_mesh(int mode,
                                          const struct SpaceTransform *space_transform,
                                          float max_dist,
@@ -238,5 +229,3 @@ void BKE_mesh_remap_calc_faces_from_mesh(int mode,
                                          const blender::OffsetIndices<int> faces_dst,
                                          const struct Mesh *me_src,
                                          struct MeshPairRemap *r_map);
-
-#endif

source/blender/blenkernel/BKE_mesh_remesh_voxel.hh

@@ -8,10 +8,6 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 
 struct Mesh *BKE_mesh_remesh_voxel_fix_poles(const struct Mesh *mesh);
@@ -32,7 +28,3 @@ struct Mesh *BKE_mesh_remesh_quadriflow(const struct Mesh *mesh,
 void BKE_mesh_remesh_reproject_paint_mask(struct Mesh *target, const struct Mesh *source);
 void BKE_remesh_reproject_vertex_paint(struct Mesh *target, const struct Mesh *source);
 void BKE_remesh_reproject_sculpt_face_sets(struct Mesh *target, const struct Mesh *source);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_runtime.hh

@@ -9,11 +9,7 @@
  * This file contains access functions for the Mesh.runtime struct.
  */
 
-#include "BKE_mesh_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BKE_mesh_types.hh"
 
 struct CustomData_MeshMasks;
 struct Depsgraph;
@@ -96,7 +92,3 @@ void BKE_mesh_runtime_eval_to_meshkey(struct Mesh *me_deformed,
 #ifndef NDEBUG
 bool BKE_mesh_runtime_is_valid(struct Mesh *me_eval);
 #endif /* NDEBUG */
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_mesh_tangent.hh

@@ -7,11 +7,10 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-#  include "BLI_offset_indices.hh"
-#endif
+#include "DNA_customdata_types.h"
 
-#ifdef __cplusplus
+#include "BLI_offset_indices.hh"
+#include "BLI_sys_types.h"
 
 struct ReportList;
 
@@ -32,12 +31,6 @@ void BKE_mesh_calc_loop_tangent_single_ex(const float (*vert_positions)[3],
                                           blender::OffsetIndices<int> faces,
                                           struct ReportList *reports);
 
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Wrapper around BKE_mesh_calc_loop_tangent_single_ex, which takes care of most boilerplate code.
  * \note
@@ -49,12 +42,6 @@ void BKE_mesh_calc_loop_tangent_single(struct Mesh *mesh,
                                        float (*r_looptangents)[4],
                                        struct ReportList *reports);
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-
 /**
  * See: #BKE_editmesh_loop_tangent_calc (matching logic).
  */
@@ -90,7 +77,7 @@ void BKE_mesh_add_loop_tangent_named_layer_for_uv(struct CustomData *uv_data,
                                                   int numLoopData,
                                                   const char *layer_name);
 
-#  define DM_TANGENT_MASK_ORCO (1 << 9)
+#define DM_TANGENT_MASK_ORCO (1 << 9)
 /**
  * Here we get some useful information such as active uv layer name and
  * search if it is already in tangent_names.
@@ -108,5 +95,3 @@ void BKE_mesh_calc_loop_tangent_step_0(const struct CustomData *loopData,
                                        char *ract_uv_name,
                                        char *rren_uv_name,
                                        short *rtangent_mask);
-
-#endif

source/blender/blenkernel/BKE_mesh_types.hh

@@ -8,20 +8,18 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
+#include <mutex>
 
-#  include <mutex>
+#include "BLI_array.hh"
+#include "BLI_bit_vector.hh"
+#include "BLI_bounds_types.hh"
+#include "BLI_implicit_sharing.hh"
+#include "BLI_math_vector_types.hh"
+#include "BLI_shared_cache.hh"
+#include "BLI_vector.hh"
 
-#  include "BLI_array.hh"
-#  include "BLI_bit_vector.hh"
-#  include "BLI_bounds_types.hh"
-#  include "BLI_implicit_sharing.hh"
-#  include "BLI_math_vector_types.hh"
-#  include "BLI_shared_cache.hh"
-#  include "BLI_vector.hh"
-
-#  include "DNA_customdata_types.h"
-#  include "DNA_meshdata_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_meshdata_types.h"
 
 struct BVHCache;
 struct Mesh;
@@ -33,21 +31,6 @@ namespace blender::bke {
 struct EditMeshData;
 }
 
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum eMeshBatchDirtyMode {
-  BKE_MESH_BATCH_DIRTY_ALL = 0,
-  BKE_MESH_BATCH_DIRTY_SELECT,
-  BKE_MESH_BATCH_DIRTY_SELECT_PAINT,
-  BKE_MESH_BATCH_DIRTY_SHADING,
-  BKE_MESH_BATCH_DIRTY_UVEDIT_ALL,
-  BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT,
-} eMeshBatchDirtyMode;
-
 /** #MeshRuntime.wrapper_type */
 typedef enum eMeshWrapperType {
   /** Use mesh data (#Mesh.vert_positions(), #Mesh.medge, #Mesh.corner_verts(), #Mesh.faces()). */
@@ -58,12 +41,6 @@ typedef enum eMeshWrapperType {
   ME_WRAPPER_TYPE_SUBD = 2,
 } eMeshWrapperType;
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-
 namespace blender::bke {
 
 /**
@@ -200,5 +177,3 @@ struct MeshRuntime {
 };
 
 }  // namespace blender::bke
-
-#endif

source/blender/blenkernel/BKE_mesh_wrapper.hh

@@ -11,10 +11,6 @@ struct BMEditMesh;
 struct CustomData_MeshMasks;
 struct Mesh;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh *BKE_mesh_wrapper_from_editmesh(struct BMEditMesh *em,
                                             const struct CustomData_MeshMasks *cd_mask_extra,
                                             const struct Mesh *me_settings);
@@ -49,7 +45,3 @@ void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const struct Mesh *me,
                                                  const float mat[4][4]);
 
 struct Mesh *BKE_mesh_wrapper_ensure_subdivision(struct Mesh *me);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_multires.hh

@@ -8,13 +8,9 @@
  * \ingroup bke
  */
 
-#include "BKE_subsurf.h"
+#include "BKE_subsurf.hh"
 #include "BLI_utildefines.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Depsgraph;
 struct DerivedMesh;
 struct MDisps;
@@ -243,8 +239,4 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3]
 void multires_do_versions_simple_to_catmull_clark(struct Object *object,
                                                   struct MultiresModifierData *mmd);
 
-#ifdef __cplusplus
-}
-#endif
-
-#include "intern/multires_inline.h"
+#include "intern/multires_inline.hh"

source/blender/blenkernel/BKE_paint.hh

@@ -8,13 +8,11 @@
  * \ingroup bke
  */
 
+#include "BLI_array.hh"
 #include "BLI_bitmap.h"
 #include "BLI_compiler_compat.h"
-#ifdef __cplusplus
-#  include "BLI_array.hh"
-#  include "BLI_math_vector_types.hh"
-#  include "BLI_offset_indices.hh"
-#endif
+#include "BLI_math_vector_types.hh"
+#include "BLI_offset_indices.hh"
 #include "BLI_utildefines.h"
 
 #include "DNA_brush_enums.h"
@@ -25,10 +23,6 @@
 
 #include "bmesh.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BMFace;
 struct BMesh;
 struct BlendDataReader;
@@ -282,7 +276,6 @@ void BKE_paint_blend_read_lib(struct BlendLibReader *reader,
 #define SCULPT_FACE_SET_NONE 0
 
 /** Used for both vertex color and weight paint. */
-#ifdef __cplusplus
 struct SculptVertexPaintGeomMap {
   blender::Array<int> vert_to_loop_offsets;
   blender::Array<int> vert_to_loop_indices;
@@ -292,7 +285,6 @@ struct SculptVertexPaintGeomMap {
   blender::Array<int> vert_to_face_indices;
   blender::GroupedSpan<int> vert_to_face;
 };
-#endif
 
 /** Pose Brush IK Chain. */
 typedef struct SculptPoseIKChainSegment {
@@ -581,8 +573,6 @@ typedef struct SculptAttributePointers {
   SculptAttribute *dyntopo_node_id_face;
 } SculptAttributePointers;
 
-#ifdef __cplusplus
-
 typedef struct SculptSession {
   /* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
   struct { /* Special handling for multires meshes */
@@ -780,8 +770,6 @@ typedef struct SculptSession {
   bool islands_valid; /* Is attrs.topology_island_key valid? */
 } SculptSession;
 
-#endif
-
 void BKE_sculptsession_free(struct Object *ob);
 void BKE_sculptsession_free_deformMats(struct SculptSession *ss);
 void BKE_sculptsession_free_vwpaint_data(struct SculptSession *ss);
@@ -955,7 +943,3 @@ int BKE_paint_canvas_uvmap_layer_index_get(const struct PaintModeSettings *setti
                                            struct Object *ob);
 void BKE_sculpt_check_cavity_curves(struct Sculpt *sd);
 struct CurveMapping *BKE_sculpt_default_cavity_curve(void);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subdiv.hh

@@ -11,10 +11,6 @@
 #include "BLI_compiler_compat.h"
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 struct MultiresModifierData;
 struct OpenSubdiv_Converter;
@@ -309,8 +305,4 @@ BLI_INLINE void BKE_subdiv_rotate_grid_to_quad(
 /* Convert Blender edge crease value to OpenSubdiv sharpness. */
 BLI_INLINE float BKE_subdiv_crease_to_sharpness_f(float edge_crease);
 
-#ifdef __cplusplus
-}
-#endif
-
-#include "intern/subdiv_inline.h"
+#include "intern/subdiv_inline.hh"

source/blender/blenkernel/BKE_subdiv_ccg.hh

@@ -8,17 +8,11 @@
 
 #pragma once
 
-#include "BKE_DerivedMesh.h"
 #include "BLI_bitmap.h"
+#include "BLI_offset_indices.hh"
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-#  include "BLI_offset_indices.hh"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BKE_DerivedMesh.h"
 
 struct CCGElem;
 struct CCGFace;
@@ -308,8 +302,6 @@ typedef enum SubdivCCGAdjacencyType {
   SUBDIV_CCG_ADJACENT_EDGE,
 } SubdivCCGAdjacencyType;
 
-#ifdef __cplusplus
-
 /* Returns if a grid coordinates is adjacent to a coarse mesh edge, vertex or nothing. If it is
  * adjacent to an edge, r_v1 and r_v2 will be set to the two vertices of that edge. If it is
  * adjacent to a vertex, r_v1 and r_v2 will be the index of that vertex. */
@@ -321,8 +313,6 @@ SubdivCCGAdjacencyType BKE_subdiv_ccg_coarse_mesh_adjacency_info_get(
     int *r_v1,
     int *r_v2);
 
-#endif
-
 /* Get array which is indexed by face index and contains index of a first grid of the face.
  *
  * The "ensure" version allocates the mapping if it's not known yet and stores it in the subdiv_ccg
@@ -334,7 +324,3 @@ const int *BKE_subdiv_ccg_start_face_grid_index_get(const SubdivCCG *subdiv_ccg)
 
 void BKE_subdiv_ccg_grid_hidden_ensure(SubdivCCG *subdiv_ccg, int grid_index);
 void BKE_subdiv_ccg_grid_hidden_free(SubdivCCG *subdiv_ccg, int grid_index);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subdiv_deform.hh

@@ -10,10 +10,6 @@
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 struct Subdiv;
 
@@ -28,7 +24,3 @@ void BKE_subdiv_deform_coarse_vertices(struct Subdiv *subdiv,
                                        const struct Mesh *coarse_mesh,
                                        float (*vertex_cos)[3],
                                        int num_verts);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subdiv_eval.hh

@@ -10,10 +10,6 @@
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 struct OpenSubdiv_EvaluatorCache;
 struct OpenSubdiv_EvaluatorSettings;
@@ -95,7 +91,3 @@ void BKE_subdiv_eval_displacement(struct Subdiv *subdiv,
 /* Evaluate point on a limit surface with displacement applied to it. */
 void BKE_subdiv_eval_final_point(
     struct Subdiv *subdiv, int ptex_face_index, float u, float v, float r_P[3]);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subdiv_modifier.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BKE_subdiv.h"
+#include "BKE_subdiv.hh"
 
 #include "BLI_sys_types.h"
 

source/blender/blenkernel/BKE_subdiv_topology.hh

@@ -8,14 +8,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Subdiv;
 
 int BKE_subdiv_topology_num_fvar_layers_get(const struct Subdiv *subdiv);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subsurf.hh

@@ -14,10 +14,6 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct CCGEdge;
 struct CCGElem;
 struct CCGFace;
@@ -129,7 +125,3 @@ typedef struct CCGDerivedMesh {
   ThreadMutex loops_cache_lock;
   ThreadRWMutex origindex_cache_rwlock;
 } CCGDerivedMesh;
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/CMakeLists.txt

@@ -344,7 +344,7 @@ set(SRC
   BKE_blendfile_link_append.h
   BKE_boids.h
   BKE_bpath.h
-  BKE_brush.h
+  BKE_brush.hh
   BKE_bvhutils.h
   BKE_cachefile.h
   BKE_callbacks.h
@@ -434,21 +434,21 @@ set(SRC
   BKE_mesh.h
   BKE_mesh.hh
   BKE_mesh_boolean_convert.hh
-  BKE_mesh_fair.h
-  BKE_mesh_iterators.h
-  BKE_mesh_legacy_convert.h
-  BKE_mesh_mapping.h
-  BKE_mesh_mirror.h
-  BKE_mesh_remap.h
-  BKE_mesh_remesh_voxel.h
-  BKE_mesh_runtime.h
+  BKE_mesh_fair.hh
+  BKE_mesh_iterators.hh
+  BKE_mesh_legacy_convert.hh
+  BKE_mesh_mapping.hh
+  BKE_mesh_mirror.hh
+  BKE_mesh_remap.hh
+  BKE_mesh_remesh_voxel.hh
+  BKE_mesh_runtime.hh
   BKE_mesh_sample.hh
-  BKE_mesh_tangent.h
-  BKE_mesh_types.h
-  BKE_mesh_wrapper.h
+  BKE_mesh_tangent.hh
+  BKE_mesh_types.hh
+  BKE_mesh_wrapper.hh
   BKE_modifier.h
   BKE_movieclip.h
-  BKE_multires.h
+  BKE_multires.hh
   BKE_nla.h
   BKE_node.h
   BKE_node.hh
@@ -462,7 +462,7 @@ set(SRC
   BKE_ocean.h
   BKE_outliner_treehash.hh
   BKE_packedFile.h
-  BKE_paint.h
+  BKE_paint.hh
   BKE_particle.h
   BKE_pbvh.h
   BKE_pbvh_api.hh
@@ -484,15 +484,15 @@ set(SRC
   BKE_sound.h
   BKE_speaker.h
   BKE_studiolight.h
-  BKE_subdiv.h
-  BKE_subdiv_ccg.h
-  BKE_subdiv_deform.h
-  BKE_subdiv_eval.h
+  BKE_subdiv.hh
+  BKE_subdiv_ccg.hh
+  BKE_subdiv_deform.hh
+  BKE_subdiv_eval.hh
   BKE_subdiv_foreach.hh
   BKE_subdiv_mesh.hh
-  BKE_subdiv_modifier.h
-  BKE_subdiv_topology.h
-  BKE_subsurf.h
+  BKE_subdiv_modifier.hh
+  BKE_subdiv_topology.hh
+  BKE_subsurf.hh
   BKE_text.h
   BKE_text_suggestions.h
   BKE_texture.h
@@ -521,15 +521,15 @@ set(SRC
   intern/attribute_access_intern.hh
   intern/data_transfer_intern.h
   intern/lib_intern.h
-  intern/multires_inline.h
+  intern/multires_inline.hh
   intern/multires_reshape.hh
   intern/multires_unsubdivide.hh
   intern/ocean_intern.h
   intern/pbvh_intern.hh
   intern/pbvh_pixels_copy.hh
   intern/pbvh_uv_islands.hh
-  intern/subdiv_converter.h
-  intern/subdiv_inline.h
+  intern/subdiv_converter.hh
+  intern/subdiv_inline.hh
 )
 
 set(LIB

source/blender/blenkernel/intern/CCGSubSurf.cc

@@ -16,7 +16,7 @@
 #include "BLI_utildefines.h" /* for BLI_assert */
 
 #include "BKE_ccg.h"
-#include "BKE_subsurf.h"
+#include "BKE_subsurf.hh"
 #include "CCGSubSurf.h"
 #include "CCGSubSurf_intern.h"
 

source/blender/blenkernel/intern/DerivedMesh.cc

@@ -44,17 +44,17 @@
 #include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_iterators.h"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_tangent.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_iterators.hh"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_tangent.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_object.h"
 #include "BKE_object_deform.h"
-#include "BKE_paint.h"
-#include "BKE_subdiv_modifier.h"
+#include "BKE_paint.hh"
+#include "BKE_subdiv_modifier.hh"
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 

source/blender/blenkernel/intern/armature_deform.cc

@@ -36,7 +36,7 @@
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
-#include "BKE_mesh.h"
+#include "BKE_mesh.hh"
 
 #include "DEG_depsgraph_build.h"
 

source/blender/blenkernel/intern/blender.cc

@@ -26,7 +26,7 @@
 #include "BKE_blender_user_menu.h"
 #include "BKE_blender_version.h" /* own include */
 #include "BKE_blendfile.h"
-#include "BKE_brush.h"
+#include "BKE_brush.hh"
 #include "BKE_cachefile.h"
 #include "BKE_callbacks.h"
 #include "BKE_global.h"

source/blender/blenkernel/intern/brush.cc

@@ -22,7 +22,7 @@
 #include "BLT_translation.h"
 
 #include "BKE_bpath.h"
-#include "BKE_brush.h"
+#include "BKE_brush.hh"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_gpencil_legacy.h"
@@ -33,7 +33,7 @@
 #include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 #include "BKE_texture.h"
 
 #include "IMB_colormanagement.h"

source/blender/blenkernel/intern/bvhutils.cc

@@ -26,7 +26,7 @@
 #include "BKE_bvhutils.h"
 #include "BKE_editmesh.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_pointcloud.h"
 
 #include "MEM_guardedalloc.h"

source/blender/blenkernel/intern/cdderivedmesh.cc

@@ -22,9 +22,9 @@
 #include "BKE_curve.h"
 #include "BKE_editmesh.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 #include "BKE_object.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 #include "BKE_pbvh.h"
 
 #include "DNA_curve_types.h" /* for Curve */

source/blender/blenkernel/intern/cloth.cc

@@ -29,7 +29,7 @@
 #include "BKE_global.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
 #include "BKE_pointcache.h"
 

source/blender/blenkernel/intern/constraint.cc

@@ -58,7 +58,7 @@
 #include "BKE_idprop.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"

source/blender/blenkernel/intern/crazyspace.cc

@@ -27,9 +27,9 @@
 #include "BKE_grease_pencil.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_report.h"
 
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/customdata.cc

@@ -48,10 +48,10 @@
 #include "BKE_customdata_file.h"
 #include "BKE_deform.h"
 #include "BKE_main.h"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_remap.h"
-#include "BKE_multires.h"
-#include "BKE_subsurf.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_remap.hh"
+#include "BKE_multires.hh"
+#include "BKE_subsurf.hh"
 
 #include "BLO_read_write.h"
 
@@ -3505,7 +3505,6 @@ void CustomData_swap_corners(CustomData *data, const int index, const int *corne
   }
 }
 
-
 void *CustomData_get_for_write(CustomData *data,
                                const int index,
                                const eCustomDataType type,

source/blender/blenkernel/intern/data_transfer.cc

@@ -24,10 +24,10 @@
 #include "BKE_data_transfer.h"
 #include "BKE_deform.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_remap.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_remap.hh"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_object_deform.h"

source/blender/blenkernel/intern/deform.cc

@@ -33,7 +33,7 @@
 #include "BKE_data_transfer.h"
 #include "BKE_deform.h" /* own include */
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 #include "BKE_object.h"
 #include "BKE_object_deform.h"
 

source/blender/blenkernel/intern/dynamicpaint.cc

@@ -51,8 +51,8 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"

source/blender/blenkernel/intern/editmesh.cc

@@ -21,8 +21,8 @@
 #include "BKE_editmesh_cache.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_iterators.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_iterators.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_object.h"
 
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/editmesh_tangent.cc

@@ -17,7 +17,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_editmesh_tangent.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_tangent.h" /* for utility functions */
+#include "BKE_mesh_tangent.hh" /* for utility functions */
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/fluid.cc

@@ -58,7 +58,7 @@
 #  include "BKE_customdata.h"
 #  include "BKE_deform.h"
 #  include "BKE_mesh.hh"
-#  include "BKE_mesh_runtime.h"
+#  include "BKE_mesh_runtime.hh"
 #  include "BKE_object.h"
 #  include "BKE_particle.h"
 #  include "BKE_scene.h"

source/blender/blenkernel/intern/geometry_component_mesh.cc

@@ -15,7 +15,7 @@
 #include "BKE_geometry_set.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 
 #include "FN_multi_function_builder.hh"
 

source/blender/blenkernel/intern/geometry_set.cc

@@ -16,7 +16,7 @@
 #include "BKE_instances.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 #include "BKE_pointcloud.h"
 #include "BKE_volume.h"

source/blender/blenkernel/intern/geometry_set_instances.cc

@@ -6,7 +6,7 @@
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 
 #include "DNA_collection_types.h"

source/blender/blenkernel/intern/gpencil_legacy.cc

@@ -48,7 +48,7 @@
 #include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 
 #include "BLI_math_color.h"
 

source/blender/blenkernel/intern/lattice_deform.cc

@@ -31,7 +31,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_mesh.h"
+#include "BKE_mesh.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 

source/blender/blenkernel/intern/lib_id_eval.cc

@@ -15,7 +15,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_lib_id.h"
-#include "BKE_mesh.h"
+#include "BKE_mesh.hh"
 
 void BKE_id_eval_properties_copy(ID *id_cow, ID *id)
 {

source/blender/blenkernel/intern/lib_remap.cc

@@ -27,7 +27,7 @@
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_node.h"
 #include "BKE_node_tree_update.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/material.cc

@@ -46,7 +46,7 @@
 
 #include "BKE_anim_data.h"
 #include "BKE_attribute.h"
-#include "BKE_brush.h"
+#include "BKE_brush.hh"
 #include "BKE_curve.h"
 #include "BKE_displist.h"
 #include "BKE_editmesh.h"

source/blender/blenkernel/intern/mesh.cc

@@ -53,11 +53,11 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_legacy_convert.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_legacy_convert.hh"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_object.h"
 
 #include "PIL_time.h"

source/blender/blenkernel/intern/mesh_convert.cc

@@ -44,8 +44,8 @@
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 /* these 2 are only used by conversion functions */
 #include "BKE_curve.h"

source/blender/blenkernel/intern/mesh_evaluate.cc

@@ -29,7 +29,7 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 
 using blender::float3;
 using blender::int2;

source/blender/blenkernel/intern/mesh_fair.cc

@@ -19,8 +19,8 @@
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_fair.h"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_fair.hh"
+#include "BKE_mesh_mapping.hh"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"

source/blender/blenkernel/intern/mesh_iterators.cc

@@ -15,7 +15,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_editmesh_cache.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_iterators.h"
+#include "BKE_mesh_iterators.hh"
 
 #include "BLI_bitmap.h"
 #include "BLI_math.h"

source/blender/blenkernel/intern/mesh_legacy_convert.cc

@@ -29,8 +29,8 @@
 #include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_legacy_convert.h"
-#include "BKE_multires.h"
+#include "BKE_mesh_legacy_convert.hh"
+#include "BKE_multires.hh"
 
 using blender::MutableSpan;
 using blender::Span;

source/blender/blenkernel/intern/mesh_mapping.cc

@@ -23,8 +23,8 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
-#include "BKE_mesh.h"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh.hh"
+#include "BKE_mesh_mapping.hh"
 #include "BLI_memarena.h"
 
 #include "BLI_strict_flags.h"

source/blender/blenkernel/intern/mesh_merge_customdata.cc

@@ -18,7 +18,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 #include "BLI_memarena.h"
 
 #include "BLI_strict_flags.h"

source/blender/blenkernel/intern/mesh_mirror.cc

@@ -17,7 +17,7 @@
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mirror.h"
+#include "BKE_mesh_mirror.hh"
 #include "BKE_modifier.h"
 
 #include "bmesh.h"

source/blender/blenkernel/intern/mesh_normals.cc

@@ -33,7 +33,7 @@
 #include "BKE_editmesh_cache.hh"
 #include "BKE_global.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 
 #include "atomic_ops.h"
 

source/blender/blenkernel/intern/mesh_remap.cc

@@ -29,9 +29,9 @@
 #include "BKE_bvhutils.h"
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_remap.h" /* own include */
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_remap.hh" /* own include */
+#include "BKE_mesh_runtime.hh"
 
 #include "BLI_strict_flags.h"
 

source/blender/blenkernel/intern/mesh_remesh_voxel.cc

@@ -33,9 +33,9 @@
 #include "BKE_editmesh.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_remesh_voxel.h" /* own include */
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_remesh_voxel.hh" /* own include */
+#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_sample.hh"
 
 #include "bmesh_tools.h"

source/blender/blenkernel/intern/mesh_runtime.cc

@@ -22,9 +22,9 @@
 #include "BKE_editmesh_cache.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_shrinkwrap.h"
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 using blender::float3;
 using blender::MutableSpan;

source/blender/blenkernel/intern/mesh_sample.cc

@@ -5,7 +5,7 @@
 #include "BKE_attribute_math.hh"
 #include "BKE_bvhutils.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_sample.hh"
 
 #include "DNA_mesh_types.h"

source/blender/blenkernel/intern/mesh_tangent.cc

@@ -22,8 +22,8 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_tangent.h"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_tangent.hh"
 #include "BKE_report.h"
 
 #include "BLI_strict_flags.h"

source/blender/blenkernel/intern/mesh_wrapper.cc

@@ -39,13 +39,13 @@
 #include "BKE_editmesh_cache.hh"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_subdiv.h"
+#include "BKE_subdiv.hh"
 #include "BKE_subdiv_mesh.hh"
-#include "BKE_subdiv_modifier.h"
+#include "BKE_subdiv_modifier.hh"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/modifier.cc

@@ -57,8 +57,8 @@
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_wrapper.h"
-#include "BKE_multires.h"
+#include "BKE_mesh_wrapper.hh"
+#include "BKE_multires.hh"
 #include "BKE_object.h"
 #include "BKE_pointcache.h"
 #include "BKE_screen.h"

source/blender/blenkernel/intern/multires.cc

@@ -26,15 +26,15 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_editmesh.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
-#include "BKE_paint.h"
+#include "BKE_multires.hh"
+#include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 #include "BKE_scene.h"
-#include "BKE_subdiv_ccg.h"
-#include "BKE_subsurf.h"
+#include "BKE_subdiv_ccg.hh"
+#include "BKE_subsurf.hh"
 
 #include "BKE_object.h"
 

source/blender/blenkernel/intern/multires_inline.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 

source/blender/blenkernel/intern/multires_reshape.cc

@@ -16,12 +16,12 @@
 #include "BKE_customdata.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_object.h"
-#include "BKE_subdiv.h"
-#include "BKE_subsurf.h"
+#include "BKE_subdiv.hh"
+#include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/multires_reshape.hh

@@ -14,7 +14,7 @@
 #include "BLI_sys_types.h"
 #include "BLI_virtual_array.hh"
 
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 
 struct Depsgraph;
 struct GridPaintMask;

source/blender/blenkernel/intern/multires_reshape_apply_base.cc

@@ -21,10 +21,10 @@
 #include "BKE_customdata.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_multires.h"
-#include "BKE_subdiv_eval.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_multires.hh"
+#include "BKE_subdiv_eval.hh"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/blenkernel/intern/multires_reshape_ccg.cc

@@ -13,7 +13,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_ccg.h"
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 bool multires_reshape_assign_final_coords_from_ccg(const MultiresReshapeContext *reshape_context,
                                                    SubdivCCG *subdiv_ccg)

source/blender/blenkernel/intern/multires_reshape_smooth.cc

@@ -20,9 +20,9 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_multires.h"
-#include "BKE_subdiv.h"
-#include "BKE_subdiv_eval.h"
+#include "BKE_multires.hh"
+#include "BKE_subdiv.hh"
+#include "BKE_subdiv_eval.hh"
 #include "BKE_subdiv_foreach.hh"
 #include "BKE_subdiv_mesh.hh"
 
@@ -31,7 +31,7 @@
 #include "opensubdiv_topology_refiner_capi.h"
 
 #include "atomic_ops.h"
-#include "subdiv_converter.h"
+#include "subdiv_converter.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Local Structs

source/blender/blenkernel/intern/multires_reshape_subdivide.cc

@@ -16,11 +16,11 @@
 #include "BKE_customdata.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
-#include "BKE_subdiv.h"
-#include "BKE_subsurf.h"
+#include "BKE_multires.hh"
+#include "BKE_subdiv.hh"
+#include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/multires_reshape_util.cc

@@ -21,11 +21,11 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
-#include "BKE_multires.h"
-#include "BKE_subdiv.h"
-#include "BKE_subdiv_ccg.h"
-#include "BKE_subdiv_eval.h"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_multires.hh"
+#include "BKE_subdiv.hh"
+#include "BKE_subdiv_ccg.hh"
+#include "BKE_subdiv_eval.hh"
 #include "BKE_subdiv_foreach.hh"
 #include "BKE_subdiv_mesh.hh"
 

source/blender/blenkernel/intern/multires_subdiv.cc

@@ -15,8 +15,8 @@
 
 #include "BKE_mesh.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
-#include "BKE_subdiv.h"
+#include "BKE_multires.hh"
+#include "BKE_subdiv.hh"
 #include "BKE_subdiv_mesh.hh"
 
 void BKE_multires_subdiv_settings_init(SubdivSettings *settings, const MultiresModifierData *mmd)

source/blender/blenkernel/intern/multires_unsubdivide.cc

@@ -22,12 +22,12 @@
 #include "BKE_customdata.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
-#include "BKE_subdiv.h"
-#include "BKE_subsurf.h"
+#include "BKE_multires.hh"
+#include "BKE_subdiv.hh"
+#include "BKE_subsurf.hh"
 
 #include "bmesh.h"
 

source/blender/blenkernel/intern/multires_versioning.cc

@@ -12,12 +12,12 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_subdiv.h"
-#include "BKE_subdiv_eval.h"
+#include "BKE_subdiv.hh"
+#include "BKE_subdiv_eval.hh"
 
 #include "multires_reshape.hh"
 #include "opensubdiv_converter_capi.h"
-#include "subdiv_converter.h"
+#include "subdiv_converter.hh"
 
 static float simple_to_catmull_clark_get_edge_sharpness(const OpenSubdiv_Converter * /*converter*/,
                                                         int /*manifold_edge_index*/)

source/blender/blenkernel/intern/object.cc

@@ -110,12 +110,12 @@
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_node.hh"
 #include "BKE_object.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_pointcloud.h"
@@ -125,8 +125,8 @@
 #include "BKE_shader_fx.h"
 #include "BKE_softbody.h"
 #include "BKE_speaker.h"
-#include "BKE_subdiv_ccg.h"
-#include "BKE_subsurf.h"
+#include "BKE_subdiv_ccg.hh"
+#include "BKE_subsurf.hh"
 #include "BKE_vfont.h"
 #include "BKE_volume.h"
 

source/blender/blenkernel/intern/object_deform.cc

@@ -35,7 +35,7 @@
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_mesh.h"
+#include "BKE_mesh.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_object_deform.h" /* own include */

source/blender/blenkernel/intern/object_dupli.cc

@@ -46,8 +46,8 @@
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_iterators.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_iterators.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"

source/blender/blenkernel/intern/paint.cc

@@ -35,7 +35,7 @@
 
 #include "BKE_attribute.h"
 #include "BKE_attribute.hh"
-#include "BKE_brush.h"
+#include "BKE_brush.hh"
 #include "BKE_ccg.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
@@ -50,16 +50,16 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
+#include "BKE_multires.hh"
 #include "BKE_object.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 #include "BKE_scene.h"
-#include "BKE_subdiv_ccg.h"
-#include "BKE_subsurf.h"
+#include "BKE_subdiv_ccg.hh"
+#include "BKE_subsurf.hh"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/paint_canvas.cc

@@ -10,7 +10,7 @@
 #include "BKE_customdata.h"
 #include "BKE_image.h"
 #include "BKE_material.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 
 #include "IMB_imbuf_types.h"
 
@@ -34,8 +34,6 @@ static TexPaintSlot *get_active_slot(Object *ob)
 
 }  // namespace blender::bke::paint::canvas
 
-extern "C" {
-
 using namespace blender::bke::paint::canvas;
 
 bool BKE_paint_canvas_image_get(PaintModeSettings *settings,
@@ -130,4 +128,3 @@ char *BKE_paint_canvas_key_get(PaintModeSettings *settings, Object *ob)
 
   return BLI_strdup(ss.str().c_str());
 }
-}

source/blender/blenkernel/intern/paint_toolslots.cc

@@ -16,10 +16,10 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_brush.h"
+#include "BKE_brush.hh"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Tool Slot Initialization / Versioning

source/blender/blenkernel/intern/particle.cc

@@ -60,8 +60,8 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_legacy_convert.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_legacy_convert.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"

source/blender/blenkernel/intern/particle_distribute.cc

@@ -29,8 +29,8 @@
 #include "BKE_global.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_legacy_convert.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_legacy_convert.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 

source/blender/blenkernel/intern/particle_system.cc

@@ -48,8 +48,8 @@
 #include "BKE_effect.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
-#include "BKE_mesh_legacy_convert.h"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_legacy_convert.hh"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_particle.h"
 
 #include "BKE_bvhutils.h"

source/blender/blenkernel/intern/pbvh.cc

@@ -27,10 +27,10 @@
 #include "BKE_attribute.h"
 #include "BKE_ccg.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_paint.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 #include "DRW_pbvh.hh"
 

source/blender/blenkernel/intern/pbvh_colors.cc

@@ -24,10 +24,10 @@
 #include "BKE_attribute.h"
 #include "BKE_ccg.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
-#include "BKE_paint.h"
+#include "BKE_mesh_mapping.hh"
+#include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 #include "PIL_time.h"
 

source/blender/blenkernel/intern/pbvh_pixels.cc

@@ -5,7 +5,7 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.h"
+#include "BKE_mesh_mapping.hh"
 #include "BKE_pbvh_api.hh"
 #include "BKE_pbvh_pixels.hh"
 

source/blender/blenkernel/intern/pointcloud.cc

@@ -33,7 +33,7 @@
 #include "BKE_lib_query.h"
 #include "BKE_lib_remap.h"
 #include "BKE_main.h"
-#include "BKE_mesh_wrapper.h"
+#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_pointcloud.h"

source/blender/blenkernel/intern/rigidbody.cc

@@ -40,7 +40,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.h"
+#include "BKE_mesh_runtime.hh"
 #include "BKE_object.h"
 #include "BKE_pointcache.h"
 #include "BKE_report.h"

source/blender/blenkernel/intern/scene.cc

@@ -82,7 +82,7 @@
 #include "BKE_node.hh"
 #include "BKE_node_runtime.hh"
 #include "BKE_object.h"
-#include "BKE_paint.h"
+#include "BKE_paint.hh"
 #include "BKE_pointcache.h"
 #include "BKE_rigidbody.h"
 #include "BKE_scene.h"

source/blender/blenkernel/intern/shrinkwrap.cc

@@ -35,9 +35,9 @@
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 #include "BKE_mesh.hh" /* for OMP limits. */
-#include "BKE_mesh_runtime.h"
-#include "BKE_mesh_wrapper.h"
-#include "BKE_subsurf.h"
+#include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_wrapper.hh"
+#include "BKE_subsurf.hh"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/blenkernel/intern/subdiv.cc

@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include "BKE_subdiv.h"
+#include "BKE_subdiv.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -15,11 +15,11 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_modifier.h"
-#include "BKE_subdiv_modifier.h"
+#include "BKE_subdiv_modifier.hh"
 
 #include "MEM_guardedalloc.h"
 
-#include "subdiv_converter.h"
+#include "subdiv_converter.hh"
 
 #include "opensubdiv_capi.h"
 #include "opensubdiv_converter_capi.h"

source/blender/blenkernel/intern/subdiv_ccg.cc

@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -22,8 +22,8 @@
 #include "BKE_ccg.h"
 #include "BKE_global.h"
 #include "BKE_mesh.hh"
-#include "BKE_subdiv.h"
-#include "BKE_subdiv_eval.h"
+#include "BKE_subdiv.hh"
+#include "BKE_subdiv_eval.hh"
 
 #include "opensubdiv_topology_refiner_capi.h"
 

source/blender/blenkernel/intern/subdiv_ccg_mask.cc

@@ -8,7 +8,7 @@
 
 #include <cmath>
 
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -19,7 +19,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.hh"
-#include "BKE_subdiv.h"
+#include "BKE_subdiv.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/subdiv_ccg_material.cc

@@ -7,7 +7,7 @@
  */
 
 #include "BKE_mesh.hh"
-#include "BKE_subdiv_ccg.h"
+#include "BKE_subdiv_ccg.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/subdiv_converter.cc

@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include "subdiv_converter.h"
+#include "subdiv_converter.hh"
 
 #include "BLI_utildefines.h"