diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 61b6a51dd02..f221c92a9da 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/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) diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.hh similarity index 98% rename from source/blender/blenkernel/BKE_brush.h rename to source/blender/blenkernel/BKE_brush.hh index 46570d280d4..7c1c784b0be 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 767817f052f..8a83ce58eb4 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/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 */ /** diff --git a/source/blender/blenkernel/BKE_mesh.hh b/source/blender/blenkernel/BKE_mesh.hh index 2d9541ec930..d835d8e575f 100644 --- a/source/blender/blenkernel/BKE_mesh.hh +++ b/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 { diff --git a/source/blender/blenkernel/BKE_mesh_fair.h b/source/blender/blenkernel/BKE_mesh_fair.hh similarity index 95% rename from source/blender/blenkernel/BKE_mesh_fair.h rename to source/blender/blenkernel/BKE_mesh_fair.hh index 78d62680aee..ff5d7d1948c 100644 --- a/source/blender/blenkernel/BKE_mesh_fair.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_iterators.h b/source/blender/blenkernel/BKE_mesh_iterators.hh similarity index 96% rename from source/blender/blenkernel/BKE_mesh_iterators.h rename to source/blender/blenkernel/BKE_mesh_iterators.hh index 7cc6e7db2ca..09e75e278f8 100644 --- a/source/blender/blenkernel/BKE_mesh_iterators.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.h b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh similarity index 95% rename from source/blender/blenkernel/BKE_mesh_legacy_convert.h rename to source/blender/blenkernel/BKE_mesh_legacy_convert.hh index 8ca629f4108..a28ac0e3796 100644 --- a/source/blender/blenkernel/BKE_mesh_legacy_convert.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.hh similarity index 94% rename from source/blender/blenkernel/BKE_mesh_mapping.h rename to source/blender/blenkernel/BKE_mesh_mapping.hh index 0a711797119..15be8e26ce2 100644 --- a/source/blender/blenkernel/BKE_mesh_mapping.h +++ b/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 faces, @@ -114,13 +106,9 @@ UvVertMap *BKE_mesh_uv_vert_map_create(blender::OffsetIndices 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 build_edge_to_face_map(OffsetIndices faces, Array &r_indices); } // namespace blender::bke::mesh -#endif diff --git a/source/blender/blenkernel/BKE_mesh_mirror.h b/source/blender/blenkernel/BKE_mesh_mirror.hh similarity index 96% rename from source/blender/blenkernel/BKE_mesh_mirror.h rename to source/blender/blenkernel/BKE_mesh_mirror.hh index 565d2b9f725..7b0f0275b37 100644 --- a/source/blender/blenkernel/BKE_mesh_mirror.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.hh similarity index 98% rename from source/blender/blenkernel/BKE_mesh_remap.h rename to source/blender/blenkernel/BKE_mesh_remap.hh index 1f87330e8af..56d26bbd64f 100644 --- a/source/blender/blenkernel/BKE_mesh_remap.h +++ b/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 faces_dst, const struct Mesh *me_src, struct MeshPairRemap *r_map); - -#endif diff --git a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h b/source/blender/blenkernel/BKE_mesh_remesh_voxel.hh similarity index 94% rename from source/blender/blenkernel/BKE_mesh_remesh_voxel.h rename to source/blender/blenkernel/BKE_mesh_remesh_voxel.hh index a2291a637eb..caa906d4c0c 100644 --- a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.hh similarity index 97% rename from source/blender/blenkernel/BKE_mesh_runtime.h rename to source/blender/blenkernel/BKE_mesh_runtime.hh index 93ee99ff824..352adcf74a8 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_mesh_tangent.h b/source/blender/blenkernel/BKE_mesh_tangent.hh similarity index 95% rename from source/blender/blenkernel/BKE_mesh_tangent.h rename to source/blender/blenkernel/BKE_mesh_tangent.hh index e88fb4beb48..5ba171fbd9a 100644 --- a/source/blender/blenkernel/BKE_mesh_tangent.h +++ b/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 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 diff --git a/source/blender/blenkernel/BKE_mesh_types.h b/source/blender/blenkernel/BKE_mesh_types.hh similarity index 89% rename from source/blender/blenkernel/BKE_mesh_types.h rename to source/blender/blenkernel/BKE_mesh_types.hh index e8f28146b14..33385a337d4 100644 --- a/source/blender/blenkernel/BKE_mesh_types.h +++ b/source/blender/blenkernel/BKE_mesh_types.hh @@ -8,20 +8,18 @@ * \ingroup bke */ -#ifdef __cplusplus +#include -# include +#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 diff --git a/source/blender/blenkernel/BKE_mesh_wrapper.h b/source/blender/blenkernel/BKE_mesh_wrapper.hh similarity index 96% rename from source/blender/blenkernel/BKE_mesh_wrapper.h rename to source/blender/blenkernel/BKE_mesh_wrapper.hh index 533855b1cfe..fa9e247f4fc 100644 --- a/source/blender/blenkernel/BKE_mesh_wrapper.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.hh similarity index 98% rename from source/blender/blenkernel/BKE_multires.h rename to source/blender/blenkernel/BKE_multires.hh index df48c062bc8..fda7f455a5c 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/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" diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.hh similarity index 99% rename from source/blender/blenkernel/BKE_paint.h rename to source/blender/blenkernel/BKE_paint.hh index fc1b6c90976..2a11c57bd41 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/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 vert_to_loop_offsets; blender::Array vert_to_loop_indices; @@ -292,7 +285,6 @@ struct SculptVertexPaintGeomMap { blender::Array vert_to_face_indices; blender::GroupedSpan 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 diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.hh similarity index 99% rename from source/blender/blenkernel/BKE_subdiv.h rename to source/blender/blenkernel/BKE_subdiv.hh index 337028420e6..6b2dbb8836b 100644 --- a/source/blender/blenkernel/BKE_subdiv.h +++ b/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" diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.hh similarity index 98% rename from source/blender/blenkernel/BKE_subdiv_ccg.h rename to source/blender/blenkernel/BKE_subdiv_ccg.hh index 3ce6df2280e..4d287891518 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_subdiv_deform.h b/source/blender/blenkernel/BKE_subdiv_deform.hh similarity index 92% rename from source/blender/blenkernel/BKE_subdiv_deform.h rename to source/blender/blenkernel/BKE_subdiv_deform.hh index 97d5f225ee1..d2d64c91d6e 100644 --- a/source/blender/blenkernel/BKE_subdiv_deform.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_subdiv_eval.h b/source/blender/blenkernel/BKE_subdiv_eval.hh similarity index 98% rename from source/blender/blenkernel/BKE_subdiv_eval.h rename to source/blender/blenkernel/BKE_subdiv_eval.hh index f48f40af225..8618318541d 100644 --- a/source/blender/blenkernel/BKE_subdiv_eval.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_subdiv_modifier.h b/source/blender/blenkernel/BKE_subdiv_modifier.hh similarity index 99% rename from source/blender/blenkernel/BKE_subdiv_modifier.h rename to source/blender/blenkernel/BKE_subdiv_modifier.hh index e5fc43b5ff6..829b4e681f7 100644 --- a/source/blender/blenkernel/BKE_subdiv_modifier.h +++ b/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" diff --git a/source/blender/blenkernel/BKE_subdiv_topology.h b/source/blender/blenkernel/BKE_subdiv_topology.hh similarity index 77% rename from source/blender/blenkernel/BKE_subdiv_topology.h rename to source/blender/blenkernel/BKE_subdiv_topology.hh index febd9afb814..c4f70bfa93b 100644 --- a/source/blender/blenkernel/BKE_subdiv_topology.h +++ b/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 diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.hh similarity index 97% rename from source/blender/blenkernel/BKE_subsurf.h rename to source/blender/blenkernel/BKE_subsurf.hh index 755f6587b26..681a62dda6e 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/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 diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index b4499546e4d..43345cc2a5d 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/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 diff --git a/source/blender/blenkernel/intern/CCGSubSurf.cc b/source/blender/blenkernel/intern/CCGSubSurf.cc index 8a208eb78d3..5423e8883f6 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index e5a2443aad0..398bb294898 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/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 */ diff --git a/source/blender/blenkernel/intern/armature_deform.cc b/source/blender/blenkernel/intern/armature_deform.cc index a0df126ffe3..e280b11bc26 100644 --- a/source/blender/blenkernel/intern/armature_deform.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc index d15c631a20d..13690870de0 100644 --- a/source/blender/blenkernel/intern/blender.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index f513371c212..b58d0cf7e07 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc index ce24c5a483a..9dd297f61e6 100644 --- a/source/blender/blenkernel/intern/bvhutils.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.cc b/source/blender/blenkernel/intern/cdderivedmesh.cc index 779517005d7..7867db24ec7 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.cc +++ b/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 */ diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc index d231d4d0195..26af3639181 100644 --- a/source/blender/blenkernel/intern/cloth.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index 88b3b7f1061..a825ec35118 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index 73512699bf3..8d84bd509f7 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index d1c1bd5ea6f..8ecbe388cef 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/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, diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc index 2b7d76461bc..e24c4d760fa 100644 --- a/source/blender/blenkernel/intern/data_transfer.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/deform.cc b/source/blender/blenkernel/intern/deform.cc index 9cbbcd63a13..d68fa718d6d 100644 --- a/source/blender/blenkernel/intern/deform.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc index 81d9b9e146b..4331f288298 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc index 047bca284cd..7eab7516140 100644 --- a/source/blender/blenkernel/intern/editmesh.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/editmesh_tangent.cc b/source/blender/blenkernel/intern/editmesh_tangent.cc index 97a0c48e679..5db8877c5a5 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc index ee6fe25041c..39266d44f47 100644 --- a/source/blender/blenkernel/intern/fluid.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index 0458b72a475..b2cbe9cbcc0 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 7e10b6fdf2c..f39309018d5 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc index 7fcb1e6792e..39861f7c2a2 100644 --- a/source/blender/blenkernel/intern/geometry_set_instances.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc index 9a93ba8d754..934ba6ed3af 100644 --- a/source/blender/blenkernel/intern/gpencil_legacy.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/lattice_deform.cc b/source/blender/blenkernel/intern/lattice_deform.cc index b6a37846d05..66f472fec79 100644 --- a/source/blender/blenkernel/intern/lattice_deform.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/lib_id_eval.cc b/source/blender/blenkernel/intern/lib_id_eval.cc index 8e8ebfec9bd..3839452f5b1 100644 --- a/source/blender/blenkernel/intern/lib_id_eval.cc +++ b/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) { diff --git a/source/blender/blenkernel/intern/lib_remap.cc b/source/blender/blenkernel/intern/lib_remap.cc index 79206675c8b..ef4ce540472 100644 --- a/source/blender/blenkernel/intern/lib_remap.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index a7351f6c26d..28e9e547412 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 825d839c314..9eb3647ccc7 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 652ced9adfe..ee943441ebd 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc index e4971c7d310..ac6df41a903 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.cc +++ b/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; diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index de9fcc5c723..a18ee533f7c 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_iterators.cc b/source/blender/blenkernel/intern/mesh_iterators.cc index 64e0cf9d9bc..95b4fb5bbc1 100644 --- a/source/blender/blenkernel/intern/mesh_iterators.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index 4938615eaed..8deefea9fb0 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/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; diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index 53a8200dc4d..3aec6f17dfc 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index 712fd37fb36..08da0f6b541 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc index e06c2b2d381..59e7f07b980 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 40fa61301f3..2f243abfae6 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc index dab4444f61c..9081e1e33b3 100644 --- a/source/blender/blenkernel/intern/mesh_remap.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc index d90ccd49081..8e7fb28e9fa 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc index d2dc480a3be..58fe6076aea 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.cc +++ b/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; diff --git a/source/blender/blenkernel/intern/mesh_sample.cc b/source/blender/blenkernel/intern/mesh_sample.cc index eb34d5c0e58..0b5b437dc02 100644 --- a/source/blender/blenkernel/intern/mesh_sample.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index c407fecaec2..13656a31b36 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index 7b193b7f6ce..d5fe1195fb9 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index b882d78094f..0e36fddfdfd 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc index 19850cb750d..1773fcce649 100644 --- a/source/blender/blenkernel/intern/multires.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_inline.h b/source/blender/blenkernel/intern/multires_inline.hh similarity index 98% rename from source/blender/blenkernel/intern/multires_inline.h rename to source/blender/blenkernel/intern/multires_inline.hh index 8d7fba75704..3c05b3d5556 100644 --- a/source/blender/blenkernel/intern/multires_inline.h +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_reshape.cc b/source/blender/blenkernel/intern/multires_reshape.cc index dfe931214a7..5d807eaab61 100644 --- a/source/blender/blenkernel/intern/multires_reshape.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_reshape.hh b/source/blender/blenkernel/intern/multires_reshape.hh index 6d1adba46aa..546288d8581 100644 --- a/source/blender/blenkernel/intern/multires_reshape.hh +++ b/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; diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc index 74f088a7782..a893653ec95 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_reshape_ccg.cc b/source/blender/blenkernel/intern/multires_reshape_ccg.cc index bdf3e6fd1e8..e089151f460 100644 --- a/source/blender/blenkernel/intern/multires_reshape_ccg.cc +++ b/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) diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.cc b/source/blender/blenkernel/intern/multires_reshape_smooth.cc index 0d02581c7e7..f09c9ebb3db 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.cc +++ b/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 diff --git a/source/blender/blenkernel/intern/multires_reshape_subdivide.cc b/source/blender/blenkernel/intern/multires_reshape_subdivide.cc index a57c3e1b38f..2bd919bfc8b 100644 --- a/source/blender/blenkernel/intern/multires_reshape_subdivide.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_reshape_util.cc b/source/blender/blenkernel/intern/multires_reshape_util.cc index a2bc8af3e52..01df1ec6330 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_subdiv.cc b/source/blender/blenkernel/intern/multires_subdiv.cc index 41174a11b22..c8e8e697bbf 100644 --- a/source/blender/blenkernel/intern/multires_subdiv.cc +++ b/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) diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.cc b/source/blender/blenkernel/intern/multires_unsubdivide.cc index c46a5b00181..f4d54265d82 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/multires_versioning.cc b/source/blender/blenkernel/intern/multires_versioning.cc index 208ee2aa1f5..55f82835fec 100644 --- a/source/blender/blenkernel/intern/multires_versioning.cc +++ b/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*/) diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 912c4942699..8bade1fa103 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/object_deform.cc b/source/blender/blenkernel/intern/object_deform.cc index f70ecf075dc..fca4edf05a4 100644 --- a/source/blender/blenkernel/intern/object_deform.cc +++ b/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 */ diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index 45138fe186c..e662ca3f193 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 6021df34856..d8985a6b322 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/paint_canvas.cc b/source/blender/blenkernel/intern/paint_canvas.cc index 2fb54b67cf9..e40fca116bb 100644 --- a/source/blender/blenkernel/intern/paint_canvas.cc +++ b/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()); } -} diff --git a/source/blender/blenkernel/intern/paint_toolslots.cc b/source/blender/blenkernel/intern/paint_toolslots.cc index 33cc934e88b..6d68ab34ca2 100644 --- a/source/blender/blenkernel/intern/paint_toolslots.cc +++ b/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 diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index 8c0e6e8f603..d4afa0ec9a2 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc index 53b9c372071..5e439cdaf4d 100644 --- a/source/blender/blenkernel/intern/particle_distribute.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc index 94b0f2a25db..4aa3664e36e 100644 --- a/source/blender/blenkernel/intern/particle_system.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 89032f8c7f9..00f965a960c 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/pbvh_colors.cc b/source/blender/blenkernel/intern/pbvh_colors.cc index 80514d7bc28..033f830b5ed 100644 --- a/source/blender/blenkernel/intern/pbvh_colors.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index 8092d1ed9f4..d585721666f 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc index 071073b8edc..e4798182daa 100644 --- a/source/blender/blenkernel/intern/pointcloud.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index d8d206e4908..f855c37f25a 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 367739da5fb..0cee402e95e 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 63ec65365c6..3f7d21b85ac 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv.cc b/source/blender/blenkernel/intern/subdiv.cc index 583f7943cb7..eb60b78c9f5 100644 --- a/source/blender/blenkernel/intern/subdiv.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 52a7f059978..db2f28b5b87 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv_ccg_mask.cc b/source/blender/blenkernel/intern/subdiv_ccg_mask.cc index 49795b1b49a..ab5b86850b7 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_mask.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg_mask.cc @@ -8,7 +8,7 @@ #include -#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" diff --git a/source/blender/blenkernel/intern/subdiv_ccg_material.cc b/source/blender/blenkernel/intern/subdiv_ccg_material.cc index fe8115bb29e..52798d2e5e6 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_material.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv_converter.cc b/source/blender/blenkernel/intern/subdiv_converter.cc index c8c979a4cc3..f02358b2091 100644 --- a/source/blender/blenkernel/intern/subdiv_converter.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv_converter.h b/source/blender/blenkernel/intern/subdiv_converter.hh similarity index 98% rename from source/blender/blenkernel/intern/subdiv_converter.h rename to source/blender/blenkernel/intern/subdiv_converter.hh index e02dbb7d792..c46d5b5ff09 100644 --- a/source/blender/blenkernel/intern/subdiv_converter.h +++ b/source/blender/blenkernel/intern/subdiv_converter.hh @@ -8,7 +8,7 @@ * \ingroup bke */ -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" /* NOTE: Was initially used to get proper enumerator types, but this makes * it tricky to compile without OpenSubdiv. */ diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc index 35a0952fffa..e2cd719bcb5 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "subdiv_converter.h" +#include "subdiv_converter.hh" #include @@ -17,8 +17,8 @@ #include "BKE_attribute.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" -#include "BKE_subdiv.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_subdiv.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_deform.cc b/source/blender/blenkernel/intern/subdiv_deform.cc index 16c43559a42..ff8879b65ed 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.cc +++ b/source/blender/blenkernel/intern/subdiv_deform.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "BKE_subdiv_deform.h" +#include "BKE_subdiv_deform.hh" #include @@ -17,8 +17,8 @@ #include "BLI_utildefines.h" #include "BKE_customdata.h" -#include "BKE_subdiv.h" -#include "BKE_subdiv_eval.h" +#include "BKE_subdiv.hh" +#include "BKE_subdiv_eval.hh" #include "BKE_subdiv_foreach.hh" #include "BKE_subdiv_mesh.hh" diff --git a/source/blender/blenkernel/intern/subdiv_displacement.cc b/source/blender/blenkernel/intern/subdiv_displacement.cc index 8a615a0bb53..f0a0abd7060 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement.cc +++ b/source/blender/blenkernel/intern/subdiv_displacement.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.cc b/source/blender/blenkernel/intern/subdiv_displacement_multires.cc index 23bfaeba1bb..baeb486c6b1 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.cc +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.cc @@ -8,7 +8,7 @@ #include -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -20,8 +20,8 @@ #include "BKE_customdata.h" #include "BKE_mesh.hh" -#include "BKE_multires.h" -#include "BKE_subdiv_eval.h" +#include "BKE_multires.hh" +#include "BKE_subdiv_eval.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_eval.cc b/source/blender/blenkernel/intern/subdiv_eval.cc index cbc9b745cfa..51d973c1ec2 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.cc +++ b/source/blender/blenkernel/intern/subdiv_eval.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "BKE_subdiv_eval.h" +#include "BKE_subdiv_eval.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -18,7 +18,7 @@ #include "BKE_customdata.h" #include "BKE_mesh.hh" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.cc b/source/blender/blenkernel/intern/subdiv_foreach.cc index 974d3a11874..62a90f6638f 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.cc +++ b/source/blender/blenkernel/intern/subdiv_foreach.cc @@ -20,7 +20,7 @@ #include "BKE_customdata.h" #include "BKE_key.h" #include "BKE_mesh.hh" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "BKE_subdiv_mesh.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.hh similarity index 99% rename from source/blender/blenkernel/intern/subdiv_inline.h rename to source/blender/blenkernel/intern/subdiv_inline.hh index b5394692de4..90d4394bafe 100644 --- a/source/blender/blenkernel/intern/subdiv_inline.h +++ b/source/blender/blenkernel/intern/subdiv_inline.hh @@ -11,7 +11,7 @@ #include "BLI_assert.h" #include "BLI_compiler_compat.h" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" BLI_INLINE void BKE_subdiv_ptex_face_uv_to_grid_uv(const float ptex_u, const float ptex_v, diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index 985a645c688..75db9ea6366 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -23,9 +23,9 @@ #include "BKE_customdata.h" #include "BKE_key.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" -#include "BKE_subdiv.h" -#include "BKE_subdiv_eval.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_subdiv.hh" +#include "BKE_subdiv_eval.hh" #include "BKE_subdiv_foreach.hh" #include "BKE_subdiv_mesh.hh" diff --git a/source/blender/blenkernel/intern/subdiv_modifier.cc b/source/blender/blenkernel/intern/subdiv_modifier.cc index 66bf192e751..08d068e1037 100644 --- a/source/blender/blenkernel/intern/subdiv_modifier.cc +++ b/source/blender/blenkernel/intern/subdiv_modifier.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_subdiv_modifier.h" +#include "BKE_subdiv_modifier.hh" #include "MEM_guardedalloc.h" @@ -14,7 +14,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "GPU_capabilities.h" #include "GPU_context.h" diff --git a/source/blender/blenkernel/intern/subdiv_stats.cc b/source/blender/blenkernel/intern/subdiv_stats.cc index 32132eb3542..5986a30366f 100644 --- a/source/blender/blenkernel/intern/subdiv_stats.cc +++ b/source/blender/blenkernel/intern/subdiv_stats.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include diff --git a/source/blender/blenkernel/intern/subdiv_topology.cc b/source/blender/blenkernel/intern/subdiv_topology.cc index c70971d3cc1..9bbfd4a5f7b 100644 --- a/source/blender/blenkernel/intern/subdiv_topology.cc +++ b/source/blender/blenkernel/intern/subdiv_topology.cc @@ -6,9 +6,9 @@ * \ingroup bke */ -#include "BKE_subdiv_topology.h" +#include "BKE_subdiv_topology.hh" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "opensubdiv_topology_refiner_capi.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.cc b/source/blender/blenkernel/intern/subsurf_ccg.cc index 610556d13bb..f42ba9b9d92 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.cc +++ b/source/blender/blenkernel/intern/subsurf_ccg.cc @@ -35,13 +35,13 @@ #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.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_scene.h" -#include "BKE_subsurf.h" +#include "BKE_subsurf.hh" #include "CCGSubSurf.h" diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc index 47b4fceae05..7e0897f05e3 100644 --- a/source/blender/blenloader/intern/versioning_250.cc +++ b/source/blender/blenloader/intern/versioning_250.cc @@ -56,9 +56,9 @@ #include "BKE_global.h" /* for G */ #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "BKE_node.h" #include "BKE_node_tree_update.h" #include "BKE_particle.h" diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc index 92d186321e3..520f5ef1567 100644 --- a/source/blender/blenloader/intern/versioning_260.cc +++ b/source/blender/blenloader/intern/versioning_260.cc @@ -45,9 +45,9 @@ #include "BKE_anim_visualization.h" #include "BKE_image.h" -#include "BKE_main.h" /* for Main */ -#include "BKE_mesh.h" /* for ME_ defines (patching) */ -#include "BKE_mesh_legacy_convert.h" +#include "BKE_main.h" /* for Main */ +#include "BKE_mesh.hh" /* for ME_ defines (patching) */ +#include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.h" #include "BKE_node_runtime.hh" #include "BKE_particle.h" diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index c3c2110f2e4..5147a4944de 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -56,7 +56,7 @@ #include "BKE_animsys.h" #include "BKE_blender.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_cloth.h" #include "BKE_collection.h" #include "BKE_colortools.h" @@ -75,11 +75,11 @@ #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_mesh.h" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_legacy_convert.hh" #include "BKE_node.h" #include "BKE_node_tree_update.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_rigidbody.h" diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc index cf455800dd0..e0b9483b204 100644 --- a/source/blender/blenloader/intern/versioning_290.cc +++ b/source/blender/blenloader/intern/versioning_290.cc @@ -51,8 +51,8 @@ #include "BKE_lib_id.h" #include "BKE_main.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" #include "BKE_node.hh" #include "IMB_imbuf.h" diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index 5536960235e..bb40d0d907d 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -32,7 +32,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_idprop.hh" #include "BKE_main.h" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh_legacy_convert.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_scene.h" diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 092d279200e..d4be17a855b 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -41,7 +41,7 @@ #include "BKE_appdir.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_curveprofile.h" #include "BKE_customdata.h" @@ -56,7 +56,7 @@ #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc index ca7f512eb56..87d2cdd3150 100644 --- a/source/blender/blenloader/intern/versioning_legacy.cc +++ b/source/blender/blenloader/intern/versioning_legacy.cc @@ -57,9 +57,9 @@ #include "BKE_deform.h" #include "BKE_fcurve.h" #include "BKE_lattice.h" -#include "BKE_main.h" /* for Main */ -#include "BKE_mesh.h" /* for ME_ defines (patching) */ -#include "BKE_mesh_legacy_convert.h" +#include "BKE_main.h" /* for Main */ +#include "BKE_mesh.hh" /* for ME_ defines (patching) */ +#include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_object.h" diff --git a/source/blender/bmesh/intern/bmesh_core.cc b/source/blender/bmesh/intern/bmesh_core.cc index 5f30810cb69..d7c34d39d1c 100644 --- a/source/blender/bmesh/intern/bmesh_core.cc +++ b/source/blender/bmesh/intern/bmesh_core.cc @@ -21,7 +21,7 @@ #include "DNA_meshdata_types.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "bmesh.h" #include "intern/bmesh_private.h" diff --git a/source/blender/bmesh/intern/bmesh_interp.cc b/source/blender/bmesh/intern/bmesh_interp.cc index 344c0b0ef5d..2a84671069d 100644 --- a/source/blender/bmesh/intern/bmesh_interp.cc +++ b/source/blender/bmesh/intern/bmesh_interp.cc @@ -21,7 +21,7 @@ #include "BKE_attribute.h" #include "BKE_customdata.h" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "bmesh.h" #include "intern/bmesh_private.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index aa5616b57db..471a5136d5a 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -93,8 +93,8 @@ #include "BKE_attribute.hh" #include "BKE_customdata.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" -#include "BKE_multires.h" +#include "BKE_mesh_runtime.hh" +#include "BKE_multires.hh" #include "BKE_key.h" #include "BKE_main.h" diff --git a/source/blender/bmesh/tools/bmesh_bevel.cc b/source/blender/bmesh/tools/bmesh_bevel.cc index e1ecd4356d2..4c79a0cdad0 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.cc +++ b/source/blender/bmesh/tools/bmesh_bevel.cc @@ -24,7 +24,7 @@ #include "BKE_curveprofile.h" #include "BKE_customdata.h" #include "BKE_deform.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "eigen_capi.h" diff --git a/source/blender/draw/engines/basic/basic_engine.cc b/source/blender/draw/engines/basic/basic_engine.cc index 2717b8a9ec7..1b4da5b8d0d 100644 --- a/source/blender/draw/engines/basic/basic_engine.cc +++ b/source/blender/draw/engines/basic/basic_engine.cc @@ -13,7 +13,7 @@ #include "BKE_global.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BLI_alloca.h" diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc index af2d9bb4b88..54535165420 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.cc +++ b/source/blender/draw/engines/eevee/eevee_materials.cc @@ -17,7 +17,7 @@ #include "BLI_string_utils.h" #include "BKE_global.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "DNA_curves_types.h" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/eevee/eevee_volumes.cc index e3c36136566..2901c0087dd 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.cc +++ b/source/blender/draw/engines/eevee/eevee_volumes.cc @@ -21,7 +21,7 @@ #include "BKE_fluid.h" #include "BKE_global.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_volume.h" #include "BKE_volume_render.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc index f44c55b7260..96cac9a33bc 100644 --- a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc @@ -8,6 +8,8 @@ * Contains everything about light baking. */ +#include + #include "DRW_render.h" #include "BKE_global.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc b/source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc index 22a8bff2f78..a427ff8d405 100644 --- a/source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc +++ b/source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc @@ -2,8 +2,10 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "eevee_reflection_probes.hh" +#include "BLI_bit_vector.hh" + #include "eevee_instance.hh" +#include "eevee_reflection_probes.hh" namespace blender::eevee { diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc index d9da3b5bc72..bf5f7109bda 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc @@ -13,7 +13,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_shader_fx.h" #include "BKE_camera.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 0526c776264..38da7f52ac3 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -16,7 +16,7 @@ #include "BKE_layer.h" #include "BKE_mask.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DNA_brush_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc index c12a3f75295..7914460d689 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_engine.cc @@ -19,7 +19,7 @@ #include "BKE_duplilist.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "GPU_capabilities.h" diff --git a/source/blender/draw/engines/overlay/overlay_facing.cc b/source/blender/draw/engines/overlay/overlay_facing.cc index a5a8dec9be8..677a02b9a2a 100644 --- a/source/blender/draw/engines/overlay/overlay_facing.cc +++ b/source/blender/draw/engines/overlay/overlay_facing.cc @@ -6,7 +6,7 @@ * \ingroup draw_engine */ -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DRW_render.h" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc index 214baca681c..b6d23d237c9 100644 --- a/source/blender/draw/engines/overlay/overlay_fade.cc +++ b/source/blender/draw/engines/overlay/overlay_fade.cc @@ -6,7 +6,7 @@ * \ingroup draw_engine */ -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DRW_render.h" #include "ED_view3d.h" diff --git a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc index 15f62f541b2..7fb34d6949d 100644 --- a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc +++ b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc @@ -6,7 +6,7 @@ * \ingroup draw_engine */ -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DRW_render.h" #include "ED_view3d.h" diff --git a/source/blender/draw/engines/overlay/overlay_next_engine.cc b/source/blender/draw/engines/overlay/overlay_next_engine.cc index 5cc1f26a3f2..64071b42bfc 100644 --- a/source/blender/draw/engines/overlay/overlay_next_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_next_engine.cc @@ -19,7 +19,7 @@ #include "BKE_duplilist.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "GPU_capabilities.h" diff --git a/source/blender/draw/engines/overlay/overlay_sculpt.cc b/source/blender/draw/engines/overlay/overlay_sculpt.cc index fed4888c3bd..c13e0349d08 100644 --- a/source/blender/draw/engines/overlay/overlay_sculpt.cc +++ b/source/blender/draw/engines/overlay/overlay_sculpt.cc @@ -11,9 +11,9 @@ #include "draw_cache_impl.h" #include "overlay_private.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_ccg.hh" void OVERLAY_sculpt_cache_init(OVERLAY_Data *vedata) { diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc index e7c04f17159..929a23346d2 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.cc +++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc @@ -18,7 +18,7 @@ #include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BLI_hash.h" diff --git a/source/blender/draw/engines/select/select_draw_utils.cc b/source/blender/draw/engines/select/select_draw_utils.cc index 3ed92cd54f5..64f774f7d97 100644 --- a/source/blender/draw/engines/select/select_draw_utils.cc +++ b/source/blender/draw/engines/select/select_draw_utils.cc @@ -9,7 +9,7 @@ */ #include "BKE_editmesh.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_object.h" #include "DNA_mesh_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index 9b5d73d23f9..4dab66125a0 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -5,7 +5,7 @@ #include "BKE_editmesh.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pbvh_api.hh" #include "BKE_report.h" diff --git a/source/blender/draw/engines/workbench/workbench_engine_c.cc b/source/blender/draw/engines/workbench/workbench_engine_c.cc index 3332f61c5c1..663f9cebe97 100644 --- a/source/blender/draw/engines/workbench/workbench_engine_c.cc +++ b/source/blender/draw/engines/workbench/workbench_engine_c.cc @@ -15,10 +15,10 @@ #include "BLI_alloca.h" #include "BKE_editmesh.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "DNA_curves_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc index 232f8baed19..ecdc4bc9e80 100644 --- a/source/blender/draw/engines/workbench/workbench_state.cc +++ b/source/blender/draw/engines/workbench/workbench_state.cc @@ -6,9 +6,10 @@ #include "BKE_camera.h" #include "BKE_editmesh.h" +#include "BKE_mesh_types.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/intern/draw_cache.cc b/source/blender/draw/intern/draw_cache.cc index e897927c03c..1baab41ba17 100644 --- a/source/blender/draw/intern/draw_cache.cc +++ b/source/blender/draw/intern/draw_cache.cc @@ -25,7 +25,7 @@ #include "BLI_utildefines.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "GPU_batch.h" #include "GPU_batch_utils.h" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index af8434525b4..9026318bfe6 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -19,7 +19,7 @@ #include "BKE_editmesh.h" #include "BKE_editmesh_cache.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "GPU_batch.h" diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index a055484116b..67b9e3b605f 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -25,11 +25,8 @@ struct Volume; struct bGPdata; struct GreasePencil; -#include "BKE_mesh_types.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "BKE_mesh.h" /* For #eMeshBatchDirtyMode. */ +#include "BKE_mesh_types.hh" /* -------------------------------------------------------------------- */ /** \name Expose via BKE callbacks @@ -335,7 +332,3 @@ struct GPUBatch *DRW_particles_batch_cache_get_edit_tip_points(struct Object *ob struct PTCacheEdit *edit); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/intern/draw_cache_impl.hh b/source/blender/draw/intern/draw_cache_impl.hh new file mode 100644 index 00000000000..d42171c70af --- /dev/null +++ b/source/blender/draw/intern/draw_cache_impl.hh @@ -0,0 +1,341 @@ +/* SPDX-FileCopyrightText: 2016 Blender Foundation + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup draw + */ + +#pragma once + +struct GPUBatch; +struct GPUMaterial; +struct GPUVertBuf; +struct ModifierData; +struct PTCacheEdit; +struct ParticleSystem; +struct TaskGraph; + +struct Curve; +struct Curves; +struct Lattice; +struct Mesh; +struct PointCloud; +struct Volume; +struct bGPdata; +struct GreasePencil; + +#include "BKE_mesh_types.hh" + +#ifdef __cplusplus +extern "C" { +#endif + +/* -------------------------------------------------------------------- */ +/** \name Expose via BKE callbacks + * \{ */ + +void DRW_curve_batch_cache_dirty_tag(struct Curve *cu, int mode); +void DRW_curve_batch_cache_validate(struct Curve *cu); +void DRW_curve_batch_cache_free(struct Curve *cu); + +void DRW_mesh_batch_cache_dirty_tag(struct Mesh *me, eMeshBatchDirtyMode mode); +void DRW_mesh_batch_cache_validate(struct Object *object, struct Mesh *me); +void DRW_mesh_batch_cache_free(void *batch_cache); + +void DRW_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode); +void DRW_lattice_batch_cache_validate(struct Lattice *lt); +void DRW_lattice_batch_cache_free(struct Lattice *lt); + +void DRW_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode); +void DRW_particle_batch_cache_free(struct ParticleSystem *psys); + +void DRW_gpencil_batch_cache_dirty_tag(struct bGPdata *gpd); +void DRW_gpencil_batch_cache_free(struct bGPdata *gpd); + +void DRW_curves_batch_cache_dirty_tag(struct Curves *curves, int mode); +void DRW_curves_batch_cache_validate(struct Curves *curves); +void DRW_curves_batch_cache_free(struct Curves *curves); + +void DRW_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, int mode); +void DRW_pointcloud_batch_cache_validate(struct PointCloud *pointcloud); +void DRW_pointcloud_batch_cache_free(struct PointCloud *pointcloud); + +void DRW_volume_batch_cache_dirty_tag(struct Volume *volume, int mode); +void DRW_volume_batch_cache_validate(struct Volume *volume); +void DRW_volume_batch_cache_free(struct Volume *volume); + +void DRW_grease_pencil_batch_cache_dirty_tag(struct GreasePencil *grase_pencil, int mode); +void DRW_grease_pencil_batch_cache_validate(struct GreasePencil *grase_pencil); +void DRW_grease_pencil_batch_cache_free(struct GreasePencil *grase_pencil); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Garbage Collection + * \{ */ + +void DRW_batch_cache_free_old(struct Object *ob, int ctime); + +/** + * Thread safety need to be assured by caller. Don't call this during drawing. + * \note For now this only free the shading batches / VBO if any cd layers is not needed anymore. + */ +void DRW_mesh_batch_cache_free_old(struct Mesh *me, int ctime); +void DRW_curves_batch_cache_free_old(struct Curves *curves, int ctime); +void DRW_pointcloud_batch_cache_free_old(struct PointCloud *pointcloud, int ctime); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Generic + * \{ */ + +void DRW_vertbuf_create_wiredata(struct GPUVertBuf *vbo, int vert_len); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Curve + * \{ */ + +void DRW_curve_batch_cache_create_requested(struct Object *ob, const struct Scene *scene); + +int DRW_curve_material_count_get(struct Curve *cu); + +struct GPUBatch *DRW_curve_batch_cache_get_wire_edge(struct Curve *cu); +struct GPUBatch *DRW_curve_batch_cache_get_wire_edge_viewer_attribute(struct Curve *cu); +struct GPUBatch *DRW_curve_batch_cache_get_normal_edge(struct Curve *cu); +struct GPUBatch *DRW_curve_batch_cache_get_edit_edges(struct Curve *cu); +struct GPUBatch *DRW_curve_batch_cache_get_edit_verts(struct Curve *cu); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Lattice + * \{ */ + +struct GPUBatch *DRW_lattice_batch_cache_get_all_edges(struct Lattice *lt, + bool use_weight, + int actdef); +struct GPUBatch *DRW_lattice_batch_cache_get_all_verts(struct Lattice *lt); +struct GPUBatch *DRW_lattice_batch_cache_get_edit_verts(struct Lattice *lt); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Curves + * \{ */ + +int DRW_curves_material_count_get(struct Curves *curves); + +/** + * Provide GPU access to a specific evaluated attribute on curves. + * + * \return A pointer to location where the texture will be + * stored, which will be filled by #DRW_shgroup_curves_create_sub. + */ +struct GPUVertBuf **DRW_curves_texture_for_evaluated_attribute(struct Curves *curves, + const char *name, + bool *r_is_point_domain); + +struct GPUBatch *DRW_curves_batch_cache_get_edit_points(struct Curves *curves); +struct GPUBatch *DRW_curves_batch_cache_get_edit_lines(struct Curves *curves); + +void DRW_curves_batch_cache_create_requested(struct Object *ob); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name PointCloud + * \{ */ + +int DRW_pointcloud_material_count_get(struct PointCloud *pointcloud); + +struct GPUVertBuf *DRW_pointcloud_position_and_radius_buffer_get(struct Object *ob); + +struct GPUVertBuf **DRW_pointcloud_evaluated_attribute(struct PointCloud *pointcloud, + const char *name); +struct GPUBatch *DRW_pointcloud_batch_cache_get_dots(struct Object *ob); + +void DRW_pointcloud_batch_cache_create_requested(struct Object *ob); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Volume + * \{ */ + +int DRW_volume_material_count_get(struct Volume *volume); + +struct GPUBatch *DRW_volume_batch_cache_get_wireframes_face(struct Volume *volume); +struct GPUBatch *DRW_volume_batch_cache_get_selection_surface(struct Volume *volume); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Mesh + * \{ */ + +/** + * Can be called for any surface type. Mesh *me is the final mesh. + */ +void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, + struct Object *ob, + struct Mesh *me, + const struct Scene *scene, + bool is_paint_mode, + bool use_hide); + +struct GPUBatch *DRW_mesh_batch_cache_get_all_verts(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_all_edges(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_loose_edges(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edge_detection(struct Mesh *me, bool *r_is_manifold); +struct GPUBatch *DRW_mesh_batch_cache_get_surface(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_edges(struct Object *object, struct Mesh *me); +struct GPUBatch **DRW_mesh_batch_cache_get_surface_shaded(struct Object *object, + struct Mesh *me, + struct GPUMaterial **gpumat_array, + uint gpumat_array_len); + +struct GPUBatch **DRW_mesh_batch_cache_get_surface_texpaint(struct Object *object, + struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_texpaint_single(struct Object *object, + struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_vertpaint(struct Object *object, + struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_sculpt(struct Object *object, struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_weights(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_sculpt_overlays(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_surface_viewer_attribute(struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Edit-Mesh Drawing + * \{ */ + +struct GPUBatch *DRW_mesh_batch_cache_get_edit_triangles(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_vertices(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_edges(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_vert_normals(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_loop_normals(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_facedots(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_skin_roots(struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Edit-mesh Selection + * \{ */ + +struct GPUBatch *DRW_mesh_batch_cache_get_triangles_with_select_id(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_facedots_with_select_id(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edges_with_select_id(struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_verts_with_select_id(struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Object Mode Wireframe Overlays + * \{ */ + +struct GPUBatch *DRW_mesh_batch_cache_get_wireframes_face(struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Edit-mesh UV Editor + * \{ */ + +/** + * Creates the #GPUBatch for drawing the UV Stretching Area Overlay. + * Optional retrieves the total area or total uv area of the mesh. + * + * The `cache->tot_area` and cache->tot_uv_area` update are calculation are + * only valid after calling `DRW_mesh_batch_cache_create_requested`. + */ +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_faces_stretch_area(struct Object *object, + struct Mesh *me, + float **tot_area, + float **tot_uv_area); +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_faces_stretch_angle(struct Object *object, + struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_faces(struct Object *object, struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_edges(struct Object *object, struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_verts(struct Object *object, struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edituv_facedots(struct Object *object, struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name For Image UV Editor + * \{ */ + +struct GPUBatch *DRW_mesh_batch_cache_get_uv_edges(struct Object *object, struct Mesh *me); +struct GPUBatch *DRW_mesh_batch_cache_get_edit_mesh_analysis(struct Mesh *me); + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name For Direct Data Access + * \{ */ + +struct GPUVertBuf *DRW_mesh_batch_cache_pos_vertbuf_get(struct Mesh *me); + +int DRW_mesh_material_count_get(const struct Object *object, const struct Mesh *me); + +/* Edit mesh bitflags (is this the right place?) */ +enum { + VFLAG_VERT_ACTIVE = 1 << 0, + VFLAG_VERT_SELECTED = 1 << 1, + VFLAG_VERT_SELECTED_BEZT_HANDLE = 1 << 2, + VFLAG_EDGE_ACTIVE = 1 << 3, + VFLAG_EDGE_SELECTED = 1 << 4, + VFLAG_EDGE_SEAM = 1 << 5, + VFLAG_EDGE_SHARP = 1 << 6, + VFLAG_EDGE_FREESTYLE = 1 << 7, + /* Beware to not go over 1 << 7 (it's a byte flag). */ + /* NOTE: Grease pencil edit curve use another type of data format that allows for this value. */ + VFLAG_VERT_GPENCIL_BEZT_HANDLE = 1 << 30, +}; + +enum { + VFLAG_FACE_ACTIVE = 1 << 0, + VFLAG_FACE_SELECTED = 1 << 1, + VFLAG_FACE_FREESTYLE = 1 << 2, + VFLAG_VERT_UV_SELECT = 1 << 3, + VFLAG_VERT_UV_PINNED = 1 << 4, + VFLAG_EDGE_UV_SELECT = 1 << 5, + VFLAG_FACE_UV_ACTIVE = 1 << 6, + VFLAG_FACE_UV_SELECT = 1 << 7, + /* Beware to not go over 1 << 7 (it's a byte flag). */ +}; + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Particles + * \{ */ + +struct GPUBatch *DRW_particles_batch_cache_get_hair(struct Object *object, + struct ParticleSystem *psys, + struct ModifierData *md); +struct GPUBatch *DRW_particles_batch_cache_get_dots(struct Object *object, + struct ParticleSystem *psys); +struct GPUBatch *DRW_particles_batch_cache_get_edit_strands(struct Object *object, + struct ParticleSystem *psys, + struct PTCacheEdit *edit, + bool use_weight); +struct GPUBatch *DRW_particles_batch_cache_get_edit_inner_points(struct Object *object, + struct ParticleSystem *psys, + struct PTCacheEdit *edit); +struct GPUBatch *DRW_particles_batch_cache_get_edit_tip_points(struct Object *object, + struct ParticleSystem *psys, + struct PTCacheEdit *edit); + +/** \} */ + +#ifdef __cplusplus +} +#endif diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 6e56b29e2ce..54890737527 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -38,13 +38,13 @@ #include "BKE_editmesh_cache.hh" #include "BKE_editmesh_tangent.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_modifier.h" #include "BKE_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_subdiv_modifier.h" +#include "BKE_subdiv_modifier.hh" #include "atomic_ops.h" diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index ceb86c10128..bf7d392e451 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -25,8 +25,8 @@ #include "DNA_particle_types.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_legacy_convert.hh" #include "BKE_particle.h" #include "BKE_pointcache.h" diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index a3669b5dec2..c6d342eee37 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -11,15 +11,15 @@ #include "BKE_attribute.hh" #include "BKE_editmesh.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_subdiv.h" -#include "BKE_subdiv_eval.h" +#include "BKE_subdiv.hh" +#include "BKE_subdiv_eval.hh" #include "BKE_subdiv_foreach.hh" #include "BKE_subdiv_mesh.hh" -#include "BKE_subdiv_modifier.h" +#include "BKE_subdiv_modifier.hh" #include "BLI_linklist.h" #include "BLI_string.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 750a6eae139..b9aa982b25a 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -30,15 +30,15 @@ #include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_mball.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_pointcloud.h" #include "BKE_screen.h" -#include "BKE_subdiv_modifier.h" +#include "BKE_subdiv_modifier.hh" #include "BKE_viewer_path.h" #include "BKE_volume.h" diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 80e53f02a20..7d2f91a4fdf 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -18,7 +18,7 @@ #include "BKE_image.h" #include "BKE_mesh.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "BKE_volume.h" diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index 88f1ad19e84..73d5dd0202e 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -17,7 +17,7 @@ #include "BKE_editmesh_cache.hh" #include "BKE_global.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_object.h" #include "BKE_unit.h" diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 8986484dbdd..7fadd51a72f 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -39,9 +39,9 @@ #include "BKE_ccg.h" #include "BKE_customdata.h" #include "BKE_mesh.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_ccg.hh" #include "GPU_batch.h" diff --git a/source/blender/draw/intern/draw_sculpt.cc b/source/blender/draw/intern/draw_sculpt.cc index 3abd9c48bf8..d1b879cd8c0 100644 --- a/source/blender/draw/intern/draw_sculpt.cc +++ b/source/blender/draw/intern/draw_sculpt.cc @@ -11,8 +11,10 @@ #include "draw_attributes.hh" #include "draw_pbvh.h" -#include "BKE_paint.h" +#include "BKE_mesh_types.hh" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" + #include "DRW_pbvh.hh" namespace blender::draw { diff --git a/source/blender/draw/intern/draw_view_c.cc b/source/blender/draw/intern/draw_view_c.cc index 7492c3ac768..1a28bd1ae4f 100644 --- a/source/blender/draw/intern/draw_view_c.cc +++ b/source/blender/draw/intern/draw_view_c.cc @@ -28,7 +28,7 @@ #include "BKE_global.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "view3d_intern.h" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.hh b/source/blender/draw/intern/mesh_extractors/extract_mesh.hh index ba63f017906..7d8035d987a 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh.hh +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.hh @@ -20,7 +20,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_editmesh_cache.hh" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "draw_cache_extract.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc index 4b95b6b10c8..238cbd043cb 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc @@ -11,7 +11,7 @@ #include "BLI_string.h" #include "BKE_mesh.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "draw_subdivision.h" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc index a5c2c1068a2..a59e2ff328f 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc @@ -13,7 +13,7 @@ #include "BKE_editmesh.h" #include "BKE_editmesh_tangent.h" #include "BKE_mesh.hh" -#include "BKE_mesh_tangent.h" +#include "BKE_mesh_tangent.hh" #include "extract_mesh.hh" diff --git a/source/blender/editors/armature/armature_skinning.cc b/source/blender/editors/armature/armature_skinning.cc index b5df2f984c1..2cfe6e23cad 100644 --- a/source/blender/editors/armature/armature_skinning.cc +++ b/source/blender/editors/armature/armature_skinning.cc @@ -23,13 +23,13 @@ #include "BKE_armature.h" #include "BKE_deform.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_object_deform.h" #include "BKE_report.h" -#include "BKE_subsurf.h" +#include "BKE_subsurf.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/armature/meshlaplacian.cc b/source/blender/editors/armature/meshlaplacian.cc index 0bfa1740770..4540dea4d97 100644 --- a/source/blender/editors/armature/meshlaplacian.cc +++ b/source/blender/editors/armature/meshlaplacian.cc @@ -23,8 +23,8 @@ #include "BKE_bvhutils.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 "ED_armature.h" diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 9d3cd39db91..78d856e1c0a 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -34,11 +34,11 @@ #include "BKE_layer.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_mesh_sample.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_report.h" diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index 3d101605e9a..3f9845e88e5 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/source/blender/editors/geometry/geometry_attributes.cc @@ -19,7 +19,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.hh" #include "BKE_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "RNA_access.h" diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index 40c9d263f12..8fd0bf146fc 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -25,7 +25,7 @@ #include "BKE_lib_id.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_node_runtime.hh" #include "BKE_object.h" #include "BKE_pointcloud.h" diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc index 88e221b80ae..1c7c387cd08 100644 --- a/source/blender/editors/gpencil_legacy/drawgpencil.cc +++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc @@ -34,13 +34,13 @@ #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil_legacy.h" #include "BKE_image.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc index 4099011108b..a3a063299b2 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc @@ -14,7 +14,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.cc b/source/blender/editors/gpencil_legacy/gpencil_data.cc index 3a54c670c0c..6caf4c7616a 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_data.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_data.cc @@ -38,7 +38,7 @@ #include "BKE_anim_data.h" #include "BKE_animsys.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_fcurve_driver.h" @@ -49,7 +49,7 @@ #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 260aa9d721b..20e370618c8 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -34,7 +34,7 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" @@ -47,7 +47,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index 6413121f0fc..b13e831bf97 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -26,7 +26,7 @@ #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil_geom_legacy.h" @@ -35,7 +35,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_screen.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_merge.cc b/source/blender/editors/gpencil_legacy/gpencil_merge.cc index 6ba2ddbebf9..94f8595a83b 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_merge.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_merge.cc @@ -18,7 +18,7 @@ #include "DNA_gpencil_legacy_types.h" #include "DNA_material_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_ops.cc index 01824475aac..7d85a8c2b29 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_ops.cc @@ -13,7 +13,7 @@ #include "BLI_sys_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DNA_brush_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 45c832e210c..150e31bb9b9 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -33,7 +33,7 @@ #include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" @@ -45,7 +45,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc index 126593d223c..d15070990c9 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -33,7 +33,7 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" @@ -42,7 +42,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "UI_interface.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc index 33ba1b02df4..268bc2d6c15 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc @@ -34,7 +34,7 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index 247e34d54db..7a23f0d710e 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -37,7 +37,7 @@ #include "DNA_view3d_types.h" #include "BKE_action.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_collection.h" #include "BKE_colortools.h" #include "BKE_context.h" @@ -48,7 +48,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_tracking.h" #include "WM_api.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc index 47787727535..6cc687ec2a7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "WM_api.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc index 8ffb029de9a..592ab2a6e27 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc @@ -18,7 +18,7 @@ #include "DNA_gpencil_legacy_types.h" #include "DNA_material_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc index e71a4b5016b..afa55e1d87a 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc @@ -23,7 +23,7 @@ #include "DNA_gpencil_modifier_types.h" #include "BKE_action.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc index 4c0b82921cf..c15952e4ada 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc @@ -27,7 +27,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "UI_interface.h" diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 9df5d880bbc..a870528045b 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -36,13 +36,13 @@ #include "BKE_animsys.h" #include "BKE_blender_undo.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curveprofile.h" #include "BKE_movieclip.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 7975b7135a1..359c5c2412a 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -43,7 +43,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_icons.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_studiolight.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index f0325e94c13..95cf8daa3c4 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_screen.h" #include "WM_api.h" diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc index 634ed10a83d..972ab1fd8d1 100644 --- a/source/blender/editors/interface/resources.cc +++ b/source/blender/editors/interface/resources.cc @@ -23,7 +23,7 @@ #include "BKE_addon.h" #include "BKE_appdir.h" #include "BKE_main.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BLO_readfile.h" /* for UserDef version patching. */ diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 90e34f96f6c..00827c643f9 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -28,7 +28,7 @@ #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_object.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.cc b/source/blender/editors/mesh/editmesh_knife_project.cc index f4ce806d5a2..0634b8acec2 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.cc +++ b/source/blender/editors/mesh/editmesh_knife_project.cc @@ -20,7 +20,7 @@ #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index d05329482a5..27981dfe5af 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -20,7 +20,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_shrinkwrap.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.cc b/source/blender/editors/mesh/editmesh_polybuild.cc index 2a6e3f9832f..7c759a3f1a7 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.cc +++ b/source/blender/editors/mesh/editmesh_polybuild.cc @@ -18,7 +18,7 @@ #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_report.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 30a86175bc1..a180bf8f436 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -25,7 +25,7 @@ #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_report.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index 38c6e58ea5c..b628c54d32a 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -27,8 +27,8 @@ #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_mapping.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index faf5f546f3a..497c25bdb1f 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -24,7 +24,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index ca7423fd86a..f87a31e05d1 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -35,9 +35,9 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_iterators.h" -#include "BKE_mesh_runtime.h" -#include "BKE_multires.h" +#include "BKE_mesh_iterators.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_multires.hh" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 034e6709f27..137dd84dbba 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -76,7 +76,7 @@ #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_nla.h" #include "BKE_node.hh" #include "BKE_object.h" diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc index a068cb3b0a7..6503ddb6fad 100644 --- a/source/blender/editors/object/object_bake.cc +++ b/source/blender/editors/object/object_bake.cc @@ -31,7 +31,7 @@ #include "BKE_material.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index 4433ffb6733..e2a1622d0cf 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -34,7 +34,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_modifier.h" #include "BKE_node.hh" #include "BKE_object.h" diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc index 788fe9d968a..c1a1c6f15d0 100644 --- a/source/blender/editors/object/object_data_transfer.cc +++ b/source/blender/editors/object/object_data_transfer.cc @@ -19,9 +19,9 @@ #include "BKE_context.h" #include "BKE_data_transfer.h" #include "BKE_deform.h" -#include "BKE_mesh_mapping.h" -#include "BKE_mesh_remap.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_mesh_remap.hh" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index 79bb7cfc3ae..57c8bc42fe9 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -60,7 +60,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_report.h" diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index 00d07430ce1..ff2942b37da 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -28,7 +28,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index febf4ed6368..3fc05924321 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -57,14 +57,14 @@ #include "BKE_material.h" #include "BKE_mball.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_object_deform.h" #include "BKE_ocean.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pointcloud.h" #include "BKE_report.h" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 43e6e65c1ae..1fb042195dc 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -66,7 +66,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mball.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_object.h" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 3e2715ec7c0..d9f71309688 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -33,12 +33,12 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mirror.h" -#include "BKE_mesh_remesh_voxel.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_mirror.hh" +#include "BKE_mesh_remesh_voxel.hh" +#include "BKE_mesh_runtime.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_shrinkwrap.h" diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc index 98e2960e334..b57b91f571b 100644 --- a/source/blender/editors/object/object_select.cc +++ b/source/blender/editors/object/object_select.cc @@ -42,7 +42,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 3abebc9b4e0..72c71100de1 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -45,7 +45,7 @@ #include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.hh" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "BKE_object.h" #include "BKE_pointcloud.h" #include "BKE_report.h" diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 4ad0501544b..372a4f17da5 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -40,8 +40,8 @@ #include "BKE_lattice.h" #include "BKE_layer.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_object_deform.h" diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index 3779d2249f3..c35f37ce119 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -34,8 +34,8 @@ #include "BKE_layer.h" #include "BKE_main.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" diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index 25c46fb0ff4..2321c204eb9 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -28,8 +28,8 @@ #include "BKE_lib_id.h" #include "BKE_main.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" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 46c44894026..e099d3b4da6 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -44,7 +44,7 @@ #include "BKE_animsys.h" #include "BKE_appdir.h" #include "BKE_armature.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index 3f6b4d387aa..163bc99e171 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -35,7 +35,7 @@ #include "BKE_animsys.h" #include "BKE_appdir.h" #include "BKE_blender_copybuffer.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc index 4fe0957a492..ae8f35aa09d 100644 --- a/source/blender/editors/render/render_update.cc +++ b/source/blender/editors/render/render_update.cc @@ -32,7 +32,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_node.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "NOD_composite.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 1c2b7daa091..9431f0eef58 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -16,18 +16,18 @@ #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" #include "BKE_curves_utils.hh" #include "BKE_geometry_set.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_mesh_sample.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DNA_brush_enums.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index 70a7c8a7190..5d96ad962fc 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -17,7 +17,7 @@ #include "DEG_depsgraph_query.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_colortools.h" #include "BKE_context.h" @@ -25,8 +25,8 @@ #include "BKE_curves.hh" #include "BKE_geometry_set.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" -#include "BKE_paint.h" +#include "BKE_mesh_runtime.hh" +#include "BKE_paint.hh" #include "DNA_brush_enums.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc index 05c25ac58d6..cdc0c503e3d 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc @@ -16,13 +16,13 @@ #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" -#include "BKE_paint.h" +#include "BKE_mesh_runtime.hh" +#include "BKE_paint.hh" #include "DNA_brush_enums.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 384fdc7f409..12dff5fcd93 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -5,12 +5,12 @@ #include #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_geometry_set.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_mesh_sample.hh" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index 22d9dfc0540..0c51a1d992b 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -13,10 +13,10 @@ #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_curves.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DNA_brush_enums.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index e7e3deafadb..ef8ebb1559f 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -8,13 +8,13 @@ #include "BLI_utildefines.h" #include "BLI_vector_set.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "WM_api.h" #include "WM_message.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc index 2c35351704f..b39d267e98d 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc @@ -14,10 +14,10 @@ #include "DEG_depsgraph.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_curves.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "DNA_brush_enums.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index 69703e14c23..720abd37680 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_crazyspace.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc index 2a376dc75d3..e1d1ba92805 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc @@ -12,7 +12,7 @@ #include "DNA_brush_types.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_curves.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 7fac82b684b..c5bff14deab 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -13,14 +13,14 @@ #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" #include "BKE_mesh.hh" #include "BKE_mesh_sample.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DNA_brush_enums.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc index e53b680857c..7a6c9af0dd0 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_crazyspace.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc index 556e43049ff..0b8578cf378 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc @@ -17,13 +17,13 @@ #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" -#include "BKE_paint.h" +#include "BKE_mesh_runtime.hh" +#include "BKE_paint.hh" #include "DNA_brush_enums.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc index 71d17ac5d6b..a74e10c3930 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc @@ -10,7 +10,7 @@ #include "BLI_math_geom.h" #include "BLI_task.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_crazyspace.hh" diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc index 938bf579d2b..5d5cbc7ec6b 100644 --- a/source/blender/editors/sculpt_paint/paint_canvas.cc +++ b/source/blender/editors/sculpt_paint/paint_canvas.cc @@ -9,7 +9,7 @@ #include "DNA_workspace_types.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "WM_toolsystem.h" diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc index 38e8c7eb5fc..482ab11cfd7 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.cc +++ b/source/blender/editors/sculpt_paint/paint_cursor.cc @@ -24,14 +24,14 @@ #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" #include "BKE_node_runtime.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "NOD_texture.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve.cc b/source/blender/editors/sculpt_paint/paint_curve.cc index 2a708b0fb1b..f33f64a3e5c 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.cc +++ b/source/blender/editors/sculpt_paint/paint_curve.cc @@ -23,7 +23,7 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "ED_paint.h" #include "ED_view3d.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve_undo.cc b/source/blender/editors/sculpt_paint/paint_curve_undo.cc index 097e9ac7cfc..506a563b9f7 100644 --- a/source/blender/editors/sculpt_paint/paint_curve_undo.cc +++ b/source/blender/editors/sculpt_paint/paint_curve_undo.cc @@ -13,7 +13,7 @@ #include "DNA_brush_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_undo_system.h" #include "ED_paint.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index 367a593d97b..038befd9d5f 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -22,10 +22,10 @@ #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_mesh.hh" -#include "BKE_multires.h" -#include "BKE_paint.h" +#include "BKE_multires.hh" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_subsurf.h" +#include "BKE_subsurf.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 5fae85b7148..0f02d5f7664 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -29,7 +29,7 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_image.h" @@ -38,7 +38,7 @@ #include "BKE_mesh.hh" #include "BKE_node_runtime.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "NOD_texture.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.cc b/source/blender/editors/sculpt_paint/paint_image_2d.cc index fcafb911b44..1a90c325b4d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.cc +++ b/source/blender/editors/sculpt_paint/paint_image_2d.cc @@ -21,11 +21,11 @@ #include "BLI_stack.h" #include "BLI_task.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_image.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc b/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc index 158c70e7311..c6d41def6b0 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc @@ -12,7 +12,7 @@ #include "DNA_brush_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index 5a2edd391af..a6f75d0a632 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -12,10 +12,10 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_layer.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_undo_system.h" #include "ED_paint.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index a26ae944dff..4470e783683 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -49,7 +49,7 @@ #include "DNA_scene_types.h" #include "BKE_attribute.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_camera.h" #include "BKE_colorband.h" #include "BKE_colortools.h" @@ -63,12 +63,12 @@ #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_node.hh" #include "BKE_node_runtime.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/editors/sculpt_paint/paint_intern.hh b/source/blender/editors/sculpt_paint/paint_intern.hh index 2aa13c5de62..cc548c8d380 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.hh +++ b/source/blender/editors/sculpt_paint/paint_intern.hh @@ -8,7 +8,7 @@ #pragma once -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BLI_compiler_compat.h" #include "BLI_math.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.cc b/source/blender/editors/sculpt_paint/paint_mask.cc index 6b0e2739231..f0599c23922 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_mask.cc @@ -27,16 +27,16 @@ #include "BLI_utildefines.h" #include "BLI_vector.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#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_subsurf.h" +#include "BKE_subsurf.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.cc b/source/blender/editors/sculpt_paint/paint_ops.cc index 278baea163c..ec8c8c50cef 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_ops.cc @@ -27,12 +27,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "ED_image.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.cc b/source/blender/editors/sculpt_paint/paint_stroke.cc index f00e32641e4..f9f2c38dbcc 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.cc +++ b/source/blender/editors/sculpt_paint/paint_stroke.cc @@ -25,12 +25,12 @@ #include "RNA_access.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index d38a485dbe2..6545eaa47bb 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -25,7 +25,7 @@ #include "BLT_translation.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -33,9 +33,9 @@ #include "BKE_layer.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index ad2a8fc2664..cdffaa7cb5e 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -34,17 +34,17 @@ #include "BKE_attribute.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_object.h" #include "BKE_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc index fb1cb4e42b4..97bff6439bd 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc @@ -18,8 +18,8 @@ #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_mesh_iterators.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_iterators.hh" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc index 01f8c734b51..bd3802fb500 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc @@ -22,17 +22,17 @@ #include "RNA_enum_types.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.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_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc index a7090c11729..30239dc1230 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc @@ -19,7 +19,7 @@ #include "BKE_action.h" #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_object_deform.h" diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index 56061b67dc1..8595a0d24de 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/source/blender/editors/sculpt_paint/paint_weight.cc @@ -34,17 +34,17 @@ #include "BKE_attribute.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_object.h" #include "BKE_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index 8ed1184ebc5..1c621e21dcd 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -36,7 +36,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" @@ -45,17 +45,17 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_modifier.h" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "BKE_node_runtime.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_subdiv_ccg.h" -#include "BKE_subsurf.h" +#include "BKE_subdiv_ccg.hh" +#include "BKE_subsurf.hh" #include "BLI_math_vector.hh" #include "NOD_texture.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc index 87a8e6439cf..05f736715f1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc +++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc @@ -22,13 +22,13 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.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_api.hh" #include "BKE_scene.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.cc b/source/blender/editors/sculpt_paint/sculpt_boundary.cc index 234c22002ea..ecfb1b2336b 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.cc +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.cc @@ -15,11 +15,11 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc index cd9c1d94752..f0d7c1b9efe 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc @@ -22,12 +22,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_kelvinlet.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "ED_view3d.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc index 1c82510c013..2e17108fafa 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc @@ -21,14 +21,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_bvhutils.h" #include "BKE_ccg.h" #include "BKE_collision.h" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_modifier.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index 63ebe8955e2..40feab9f8b3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -16,7 +16,7 @@ #include "DNA_mesh_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "BKE_screen.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 4727b4fe598..068d86bbbe1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -23,7 +23,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pbvh_api.hh" #include "BKE_pointcache.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index 080a01454b1..a3608e352b6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -21,18 +21,18 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_image.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_report.h" #include "BKE_scene.h" -#include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_ccg.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index 25b40f538f9..7e545e91e03 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -37,10 +37,10 @@ #include "BKE_context.h" #include "BKE_customdata.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 "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index a8145a6e1bf..f6f9ee9f4c6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -18,7 +18,7 @@ #include "DNA_userdef_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc index 98471effdfc..2f044b6f1ec 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc @@ -15,7 +15,7 @@ #include "DNA_modifier_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "BKE_scene.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index e2bdac1fd49..2c65f510392 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -20,10 +20,10 @@ #include "DNA_meshdata_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_modifier.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc index 8a038ca6016..e9dd6a4a73a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc @@ -23,9 +23,9 @@ #include "BKE_ccg.h" #include "BKE_context.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_api.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh index 3c8dc455dd9..6c61ca42e77 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh @@ -15,7 +15,7 @@ #include "DNA_scene_types.h" #include "DNA_vec_types.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "BLI_bitmap.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc index a22e86c0d1c..d7bca25ac2c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc @@ -20,7 +20,7 @@ #include "BKE_ccg.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc index f3631cbf10a..6089849a494 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc +++ b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc @@ -21,8 +21,8 @@ #include "BKE_ccg.h" #include "BKE_context.h" -#include "BKE_multires.h" -#include "BKE_paint.h" +#include "BKE_multires.hh" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc index 5f9e3795c36..07a5dc76425 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc @@ -15,7 +15,7 @@ #include "BKE_ccg.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index 42e7cd8e33d..08a383c271d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -28,17 +28,17 @@ #include "DNA_scene_types.h" #include "BKE_attribute.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mirror.h" +#include "BKE_mesh_mirror.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_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc index fe4a55093e5..b444649e64c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc @@ -16,11 +16,11 @@ #include "DNA_meshdata_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index 8fde58f2a7d..b438fff9185 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -20,7 +20,7 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_image_wrappers.hh" #include "BKE_pbvh_api.hh" #include "BKE_pbvh_pixels.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.cc b/source/blender/editors/sculpt_paint/sculpt_pose.cc index 7bc0b4e1445..38428ff7132 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.cc +++ b/source/blender/editors/sculpt_paint/sculpt_pose.cc @@ -15,11 +15,11 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.cc b/source/blender/editors/sculpt_paint/sculpt_smooth.cc index 86c58f40535..47cd19376c7 100644 --- a/source/blender/editors/sculpt_paint/sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_smooth.cc @@ -15,7 +15,7 @@ #include "DNA_meshdata_types.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index e27bdab48d6..0c3b7126bee 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -13,10 +13,10 @@ #include "DNA_meshdata_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_kelvinlet.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 0fc1f630dfb..8f396eb4bca 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -57,17 +57,17 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" -#include "BKE_multires.h" +#include "BKE_mesh_runtime.hh" +#include "BKE_multires.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.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_undo_system.h" /* TODO(sergey): Ideally should be no direct call to such low level things. */ -#include "BKE_subdiv_eval.h" +#include "BKE_subdiv_eval.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc index 1b96246de04..3402720c038 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.cc +++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc @@ -18,14 +18,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_image.h" -#include "BKE_mesh_mapping.h" -#include "BKE_paint.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_paint.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc index 8d65955e586..7b309fc0713 100644 --- a/source/blender/editors/space_buttons/buttons_context.cc +++ b/source/blender/editors/space_buttons/buttons_context.cc @@ -35,7 +35,7 @@ #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_screen.h" diff --git a/source/blender/editors/space_buttons/buttons_texture.cc b/source/blender/editors/space_buttons/buttons_texture.cc index ac8e81e9ac3..79cddd228af 100644 --- a/source/blender/editors/space_buttons/buttons_texture.cc +++ b/source/blender/editors/space_buttons/buttons_texture.cc @@ -36,7 +36,7 @@ #include "BKE_modifier.h" #include "BKE_node.hh" #include "BKE_node_runtime.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc index 9a6ac5ef09d..2a8f597a2ea 100644 --- a/source/blender/editors/space_image/image_draw.cc +++ b/source/blender/editors/space_image/image_draw.cc @@ -37,7 +37,7 @@ #include "BKE_context.h" #include "BKE_image.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc index d2af6a67b45..8cf4d1e2032 100644 --- a/source/blender/editors/space_image/image_undo.cc +++ b/source/blender/editors/space_image/image_undo.cc @@ -40,7 +40,7 @@ #include "BKE_context.h" #include "BKE_image.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index 6ec3420ce6f..bb931b1b6c3 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -46,12 +46,12 @@ #include "BKE_main.h" #include "BKE_mesh.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_particle.h" #include "BKE_pbvh_api.hh" #include "BKE_scene.h" -#include "BKE_subdiv_ccg.h" -#include "BKE_subdiv_modifier.h" +#include "BKE_subdiv_ccg.hh" +#include "BKE_subdiv_modifier.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index 557afcac206..1f79a5f3dea 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -15,7 +15,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_volume.h" #include "BKE_volume_openvdb.hh" diff --git a/source/blender/editors/space_view3d/drawobject.cc b/source/blender/editors/space_view3d/drawobject.cc index da69cfa11f4..f7294c38905 100644 --- a/source/blender/editors/space_view3d/drawobject.cc +++ b/source/blender/editors/space_view3d/drawobject.cc @@ -18,7 +18,7 @@ #include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index d5a3d6614bf..d2f28f4f09f 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -28,7 +28,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_studiolight.h" #include "BKE_unit.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index 59dd77da62f..21af80ef4cc 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -24,7 +24,7 @@ #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc index 6eb56833590..bcf62559b86 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.cc +++ b/source/blender/editors/space_view3d/view3d_iterators.cc @@ -26,9 +26,9 @@ #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_mesh.hh" -#include "BKE_mesh_iterators.h" -#include "BKE_mesh_runtime.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_iterators.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index 0d907da8cd8..3d6f9061190 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index 637212da621..7ff586ca316 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -15,7 +15,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc index eb55f4217a1..d63834e356e 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc index 98565e67445..9161bdf7251 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc index f0fa89dca18..cf378f89169 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc index 1dc0ea36d0f..9070c4c69ae 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc index c11d49d924a..0a6812870a3 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc index 87ccc41fb34..135f28ea14d 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc @@ -21,7 +21,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_vfont.h" diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 76da06ef4ab..a04ac0ef7d9 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -58,7 +58,7 @@ #include "BKE_mball.h" #include "BKE_mesh.hh" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_scene.h" #include "BKE_tracking.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index 7f4cb125aa0..a7cb660fa07 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_crazyspace.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_scene.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_edge.cc b/source/blender/editors/transform/transform_convert_mesh_edge.cc index a50dd4ed4a2..30d91a5b7f2 100644 --- a/source/blender/editors/transform/transform_convert_mesh_edge.cc +++ b/source/blender/editors/transform/transform_convert_mesh_edge.cc @@ -15,7 +15,7 @@ #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.cc b/source/blender/editors/transform/transform_convert_mesh_uv.cc index edbbb4f1b39..e21c18dcd7f 100644 --- a/source/blender/editors/transform/transform_convert_mesh_uv.cc +++ b/source/blender/editors/transform/transform_convert_mesh_uv.cc @@ -17,7 +17,7 @@ #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "ED_image.h" #include "ED_mesh.h" diff --git a/source/blender/editors/transform/transform_convert_paintcurve.cc b/source/blender/editors/transform/transform_convert_paintcurve.cc index 60eb69f9cb4..3be80527366 100644 --- a/source/blender/editors/transform/transform_convert_paintcurve.cc +++ b/source/blender/editors/transform/transform_convert_paintcurve.cc @@ -13,7 +13,7 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_sculpt.cc b/source/blender/editors/transform/transform_convert_sculpt.cc index f651cc91f18..98478914bbd 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.cc +++ b/source/blender/editors/transform/transform_convert_sculpt.cc @@ -13,7 +13,7 @@ #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_lib_id.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "ED_sculpt.h" diff --git a/source/blender/editors/transform/transform_generics.cc b/source/blender/editors/transform/transform_generics.cc index 02803f8ab36..b7cfe0422b8 100644 --- a/source/blender/editors/transform/transform_generics.cc +++ b/source/blender/editors/transform/transform_generics.cc @@ -29,7 +29,7 @@ #include "BKE_layer.h" #include "BKE_mask.h" #include "BKE_modifier.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "SEQ_transform.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d.cc b/source/blender/editors/transform/transform_gizmo_3d.cc index 1e3f560c263..8ef9379d783 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_3d.cc @@ -26,7 +26,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pointcache.h" #include "BKE_scene.h" #include "BLI_array_utils.h" diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc index 8102f90acb8..4636206cce2 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc @@ -12,7 +12,7 @@ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_unit.h" #include "ED_screen.h" diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc index d543d3eae70..94a71f7a6cf 100644 --- a/source/blender/editors/undo/ed_undo.cc +++ b/source/blender/editors/undo/ed_undo.cc @@ -26,7 +26,7 @@ #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/editors/util/ed_transverts.cc b/source/blender/editors/util/ed_transverts.cc index 7d9331dadfc..3a0bc3c9a79 100644 --- a/source/blender/editors/util/ed_transverts.cc +++ b/source/blender/editors/util/ed_transverts.cc @@ -26,7 +26,7 @@ #include "BKE_curve.h" #include "BKE_editmesh.h" #include "BKE_lattice.h" -#include "BKE_mesh_iterators.h" +#include "BKE_mesh_iterators.hh" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index a193b3de20b..fd02f680d28 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -25,10 +25,10 @@ #include "BKE_lib_remap.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_multires.h" +#include "BKE_multires.hh" #include "BKE_object.h" #include "BKE_packedFile.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_screen.h" #include "BKE_undo_system.h" diff --git a/source/blender/editors/uvedit/uvedit_clipboard.cc b/source/blender/editors/uvedit/uvedit_clipboard.cc index adf8c96ee4e..8acd2e7b660 100644 --- a/source/blender/editors/uvedit/uvedit_clipboard.cc +++ b/source/blender/editors/uvedit/uvedit_clipboard.cc @@ -24,7 +24,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_mesh_mapping.h" /* UvElementMap */ +#include "BKE_mesh_mapping.hh" /* UvElementMap */ #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index f27313877b3..a1245c635f5 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -33,7 +33,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_node.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 625e0e19cd4..27f7adbc622 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -34,7 +34,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index 0fe26bb0882..fb5a96242e0 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -38,8 +38,8 @@ #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_mapping.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index d56074c3edd..6e28b19e1d9 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -29,7 +29,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index cc1ad0c01a5..38dce7a990a 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -45,9 +45,9 @@ #include "BKE_mesh.hh" #include "BKE_report.h" #include "BKE_scene.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" diff --git a/source/blender/geometry/intern/mesh_split_edges.cc b/source/blender/geometry/intern/mesh_split_edges.cc index 14e610310e9..de0f6cec951 100644 --- a/source/blender/geometry/intern/mesh_split_edges.cc +++ b/source/blender/geometry/intern/mesh_split_edges.cc @@ -10,7 +10,7 @@ #include "BKE_attribute.hh" #include "BKE_attribute_math.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "GEO_mesh_split_edges.hh" diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc index 8cffe064f21..91a2cd5430b 100644 --- a/source/blender/geometry/intern/mesh_to_volume.cc +++ b/source/blender/geometry/intern/mesh_to_volume.cc @@ -6,7 +6,7 @@ #include "BLI_task.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_volume.h" #include "BKE_volume_openvdb.hh" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc index 6db5a815d05..0984fd01dd3 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc @@ -34,8 +34,8 @@ #include "BKE_lib_id.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_object.h" #include "BKE_pointcache.h" #include "BKE_scene.h" diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index da3bc1751ac..5b2a60ec405 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc @@ -19,9 +19,9 @@ #include "BKE_material.h" #include "BKE_mesh.hh" #include "BKE_node.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_ccg.hh" #include "DNA_userdef_types.h" @@ -118,7 +118,7 @@ eAttrDomain BKE_id_attribute_domain(const struct ID * /*id*/, /** \} */ /* -------------------------------------------------------------------- */ -/** \name Stubs of BKE_paint.h +/** \name Stubs of BKE_paint.hh * \{ */ bool paint_is_face_hidden(const int * /*looptri_faces*/, const bool * /*hide_poly*/, @@ -198,7 +198,7 @@ bool CustomData_has_layer(const struct CustomData * /*data*/, eCustomDataType /* /** \} */ /* -------------------------------------------------------------------- */ -/** \name Stubs of BKE_subdiv_ccg.h +/** \name Stubs of BKE_subdiv_ccg.hh * \{ */ int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG * /*subdiv_ccg*/, const int /*grid_index*/) { diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc index e03c809e5ef..9d879fe864f 100644 --- a/source/blender/io/alembic/exporter/abc_writer_hair.cc +++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc @@ -20,8 +20,8 @@ #include "BKE_customdata.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" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 9011dbadc06..d6606dc43d0 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -42,8 +42,8 @@ #include "BKE_lib_id.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_node.hh" #include "BKE_object.h" #include "BKE_scene.h" diff --git a/source/blender/io/ply/importer/ply_import_mesh.cc b/source/blender/io/ply/importer/ply_import_mesh.cc index 11c4118694f..854e9742270 100644 --- a/source/blender/io/ply/importer/ply_import_mesh.cc +++ b/source/blender/io/ply/importer/ply_import_mesh.cc @@ -11,7 +11,7 @@ #include "BKE_customdata.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "GEO_mesh_merge_by_distance.hh" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index cec421df512..eac758fe08b 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -19,7 +19,7 @@ #include "BKE_lib_id.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/io/usd/tests/usd_curves_test.cc b/source/blender/io/usd/tests/usd_curves_test.cc index 8433599962e..97a7cf2a4c9 100644 --- a/source/blender/io/usd/tests/usd_curves_test.cc +++ b/source/blender/io/usd/tests/usd_curves_test.cc @@ -26,7 +26,7 @@ #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_node.h" #include "BLI_fileops.h" #include "BLI_math.h" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index c8e0e21768a..a1af102abaf 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -12,7 +12,7 @@ #include "BKE_lib_id.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_object.h" #include "BLI_listbase.h" diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index c85918b1a3b..86243ad27ed 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -2131,7 +2131,7 @@ typedef struct DataTransferModifierData { /** See DT_TYPE_ enum in ED_object.h. */ int data_types; - /* See MREMAP_MODE_ enum in BKE_mesh_mapping.h */ + /* See MREMAP_MODE_ enum in BKE_mesh_mapping.hh */ int vmap_mode; int emap_mode; int lmap_mode; diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index 841eed3a2a1..103bb2c9c12 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -452,12 +452,12 @@ static EnumPropertyItem rna_enum_gpencil_brush_vertex_icons_items[] = { # include "RNA_access.h" -# include "BKE_brush.h" +# include "BKE_brush.hh" # include "BKE_colorband.h" # include "BKE_gpencil_legacy.h" # include "BKE_icons.h" # include "BKE_material.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_layer.cc b/source/blender/makesrna/intern/rna_layer.cc index 9ee80a1e2b8..00b2ff4c56e 100644 --- a/source/blender/makesrna/intern/rna_layer.cc +++ b/source/blender/makesrna/intern/rna_layer.cc @@ -37,7 +37,7 @@ # include "BKE_idprop.h" # include "BKE_layer.h" -# include "BKE_mesh.h" +# include "BKE_mesh.hh" # include "BKE_node.h" # include "BKE_scene.h" diff --git a/source/blender/makesrna/intern/rna_main.cc b/source/blender/makesrna/intern/rna_main.cc index 4a406ff5da8..3322116b5ca 100644 --- a/source/blender/makesrna/intern/rna_main.cc +++ b/source/blender/makesrna/intern/rna_main.cc @@ -21,7 +21,7 @@ # include "BKE_global.h" # include "BKE_main.h" -# include "BKE_mesh.h" +# include "BKE_mesh.hh" /* all the list begin functions are added manually here, Main is not in SDNA */ diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index b037b6a67b9..80e1ee8c5f8 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -27,7 +27,7 @@ # include "BKE_action.h" # include "BKE_armature.h" -# include "BKE_brush.h" +# include "BKE_brush.hh" # include "BKE_camera.h" # include "BKE_collection.h" # include "BKE_curve.h" @@ -45,11 +45,11 @@ # include "BKE_mask.h" # include "BKE_material.h" # include "BKE_mball.h" -# include "BKE_mesh.h" +# include "BKE_mesh.hh" # include "BKE_movieclip.h" # include "BKE_node.h" # include "BKE_object.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "BKE_particle.h" # include "BKE_pointcloud.h" # include "BKE_scene.h" diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index cf9ec274a0d..e070204e1f3 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -71,7 +71,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { # include "BKE_main.h" # include "BKE_material.h" # include "BKE_node.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "BKE_scene.h" # include "BKE_texture.h" # include "BKE_workspace.h" diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc index 0cc2ef6cdc1..5aa83765adf 100644 --- a/source/blender/makesrna/intern/rna_mesh.cc +++ b/source/blender/makesrna/intern/rna_mesh.cc @@ -56,7 +56,7 @@ static const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = { # include "BKE_customdata.h" # include "BKE_main.h" # include "BKE_mesh.hh" -# include "BKE_mesh_runtime.h" +# include "BKE_mesh_runtime.hh" # include "BKE_report.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_mesh_api.cc b/source/blender/makesrna/intern/rna_mesh_api.cc index eaa95d41e14..5f2db3110c1 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.cc +++ b/source/blender/makesrna/intern/rna_mesh_api.cc @@ -23,10 +23,10 @@ # include "DNA_mesh_types.h" # include "BKE_anim_data.h" -# include "BKE_mesh.h" -# include "BKE_mesh_mapping.h" -# include "BKE_mesh_runtime.h" -# include "BKE_mesh_tangent.h" +# include "BKE_mesh.hh" +# include "BKE_mesh_mapping.hh" +# include "BKE_mesh_runtime.hh" +# include "BKE_mesh_tangent.hh" # include "BKE_report.h" # include "ED_mesh.h" diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 56b54a9712e..277d4e5618e 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -32,9 +32,9 @@ #include "BKE_effect.h" #include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "BKE_idprop.h" -#include "BKE_mesh_mapping.h" -#include "BKE_mesh_remap.h" -#include "BKE_multires.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_mesh_remap.hh" +#include "BKE_multires.hh" #include "BKE_ocean.h" #include "RNA_access.h" @@ -674,7 +674,7 @@ const EnumPropertyItem rna_enum_subdivision_boundary_smooth_items[] = { # include "BKE_cachefile.h" # include "BKE_context.h" # include "BKE_deform.h" -# include "BKE_mesh_runtime.h" +# include "BKE_mesh_runtime.hh" # include "BKE_modifier.h" # include "BKE_object.h" # include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 9c578fef41d..2ff0d0e5b5b 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -35,7 +35,7 @@ #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_object_deform.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -322,7 +322,7 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "DNA_node_types.h" # include "BKE_armature.h" -# include "BKE_brush.h" +# include "BKE_brush.hh" # include "BKE_constraint.h" # include "BKE_context.h" # include "BKE_curve.h" @@ -333,8 +333,8 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "BKE_key.h" # include "BKE_light_linking.h" # include "BKE_material.h" -# include "BKE_mesh.h" -# include "BKE_mesh_wrapper.h" +# include "BKE_mesh.hh" +# include "BKE_mesh_wrapper.hh" # include "BKE_modifier.h" # include "BKE_object.h" # include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index 7df798114c8..4b423864850 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -61,8 +61,8 @@ static const EnumPropertyItem space_items[] = { # include "BKE_layer.h" # include "BKE_main.h" # include "BKE_mball.h" -# include "BKE_mesh.h" -# include "BKE_mesh_runtime.h" +# include "BKE_mesh.hh" +# include "BKE_mesh_runtime.hh" # include "BKE_modifier.h" # include "BKE_object.h" # include "BKE_report.h" @@ -735,7 +735,7 @@ static bool rna_Object_is_deform_modified(Object *ob, Scene *scene, int settings # ifndef NDEBUG -# include "BKE_mesh_runtime.h" +# include "BKE_mesh_runtime.hh" void rna_Object_me_eval_info( Object *ob, bContext *C, int type, PointerRNA *rnaptr_depsgraph, char *result) diff --git a/source/blender/makesrna/intern/rna_palette.cc b/source/blender/makesrna/intern/rna_palette.cc index 3ec65611cd7..28e5cbe43df 100644 --- a/source/blender/makesrna/intern/rna_palette.cc +++ b/source/blender/makesrna/intern/rna_palette.cc @@ -21,7 +21,7 @@ # include "DNA_brush_types.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "BKE_report.h" static PaletteColor *rna_Palette_color_new(Palette *palette) { diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc index f6046c4f67f..5438f1086ff 100644 --- a/source/blender/makesrna/intern/rna_particle.cc +++ b/source/blender/makesrna/intern/rna_particle.cc @@ -26,7 +26,7 @@ #include "RNA_enum_types.h" #include "BKE_mesh.hh" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh_legacy_convert.hh" #include "BLI_listbase.h" diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 8dcf3139d33..e7852a19ad9 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -34,7 +34,7 @@ #include "BKE_armature.h" #include "BKE_editmesh.h" #include "BKE_idtype.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_volume.h" #include "ED_gpencil_legacy.h" @@ -714,7 +714,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = { # include "MEM_guardedalloc.h" # include "BKE_animsys.h" -# include "BKE_brush.h" +# include "BKE_brush.hh" # include "BKE_collection.h" # include "BKE_colortools.h" # include "BKE_context.h" @@ -726,7 +726,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = { # include "BKE_image_format.h" # include "BKE_layer.h" # include "BKE_main.h" -# include "BKE_mesh.h" +# include "BKE_mesh.hh" # include "BKE_node.h" # include "BKE_pointcache.h" # include "BKE_scene.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 4c16c6266c0..25bbfedffc4 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -24,10 +24,10 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_layer.h" #include "BKE_material.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "ED_image.h" diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 3f99b5ffc0e..b0a4a02c487 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -547,7 +547,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "BLI_string.h" # include "BKE_anim_data.h" -# include "BKE_brush.h" +# include "BKE_brush.hh" # include "BKE_colortools.h" # include "BKE_context.h" # include "BKE_global.h" @@ -555,7 +555,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "BKE_idprop.h" # include "BKE_layer.h" # include "BKE_nla.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "BKE_preferences.h" # include "BKE_scene.h" # include "BKE_screen.h" diff --git a/source/blender/makesrna/intern/rna_texture.cc b/source/blender/makesrna/intern/rna_texture.cc index 106fff3dd0b..6efc1fdf899 100644 --- a/source/blender/makesrna/intern/rna_texture.cc +++ b/source/blender/makesrna/intern/rna_texture.cc @@ -24,7 +24,7 @@ #include "BKE_node.h" #include "BKE_node_tree_update.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 76d865eb7e4..e5eb51ca2b8 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -166,9 +166,9 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = { # include "BKE_idprop.h" # include "BKE_image.h" # include "BKE_main.h" -# include "BKE_mesh_runtime.h" +# include "BKE_mesh_runtime.hh" # include "BKE_object.h" -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "BKE_preferences.h" # include "BKE_screen.h" diff --git a/source/blender/makesrna/intern/rna_workspace_api.cc b/source/blender/makesrna/intern/rna_workspace_api.cc index 3cb2a9250d4..c062d82e1fa 100644 --- a/source/blender/makesrna/intern/rna_workspace_api.cc +++ b/source/blender/makesrna/intern/rna_workspace_api.cc @@ -25,7 +25,7 @@ #ifdef RNA_RUNTIME -# include "BKE_paint.h" +# include "BKE_paint.hh" # include "ED_screen.h" diff --git a/source/blender/modifiers/intern/MOD_armature.cc b/source/blender/modifiers/intern/MOD_armature.cc index b56f64b0a6c..b0ff25ebe52 100644 --- a/source/blender/modifiers/intern/MOD_armature.cc +++ b/source/blender/modifiers/intern/MOD_armature.cc @@ -26,8 +26,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc index be618baa716..03ad0e387ec 100644 --- a/source/blender/modifiers/intern/MOD_bevel.cc +++ b/source/blender/modifiers/intern/MOD_bevel.cc @@ -25,7 +25,7 @@ #include "BKE_context.h" #include "BKE_curveprofile.h" #include "BKE_deform.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 99ca7c18c68..944393c767b 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -35,7 +35,7 @@ #include "BKE_material.h" #include "BKE_mesh.hh" #include "BKE_mesh_boolean_convert.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc index eed19ae3615..3c121426fb2 100644 --- a/source/blender/modifiers/intern/MOD_cast.cc +++ b/source/blender/modifiers/intern/MOD_cast.cc @@ -23,9 +23,9 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc index 7a825057734..7a95470f9f8 100644 --- a/source/blender/modifiers/intern/MOD_cloth.cc +++ b/source/blender/modifiers/intern/MOD_cloth.cc @@ -32,7 +32,7 @@ #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_pointcache.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index 7bbdcb4469f..df9dae522de 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -27,7 +27,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" #include "BKE_scene.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc index c3a8308271d..96e57449fce 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc @@ -28,7 +28,7 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_screen.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_curve.cc b/source/blender/modifiers/intern/MOD_curve.cc index ad4b5800c5c..5bd7dee387b 100644 --- a/source/blender/modifiers/intern/MOD_curve.cc +++ b/source/blender/modifiers/intern/MOD_curve.cc @@ -24,8 +24,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index c45ca6fef5e..032d3e8cb2c 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -24,8 +24,8 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" -#include "BKE_mesh_remap.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_mesh_remap.hh" #include "BKE_modifier.h" #include "BKE_report.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index 4729a0bf24d..4a7661cf47c 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -22,7 +22,7 @@ #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_screen.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 84e47d82297..9d0f24b8cc6 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -27,7 +27,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc index 2f7eedf15ff..91cf87b8d4d 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc @@ -26,7 +26,7 @@ #include "BKE_dynamicpaint.h" #include "BKE_layer.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc index 19200d7e480..e0ff2a1a724 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.cc +++ b/source/blender/modifiers/intern/MOD_edgesplit.cc @@ -23,7 +23,7 @@ #include "DNA_screen_types.h" #include "BKE_context.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc index e18bf2f167d..6fe7d4a436f 100644 --- a/source/blender/modifiers/intern/MOD_explode.cc +++ b/source/blender/modifiers/intern/MOD_explode.cc @@ -29,7 +29,7 @@ #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_scene.h" diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc index c9a5f860b20..85cf5a7ffa7 100644 --- a/source/blender/modifiers/intern/MOD_hook.cc +++ b/source/blender/modifiers/intern/MOD_hook.cc @@ -26,8 +26,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.cc b/source/blender/modifiers/intern/MOD_laplaciandeform.cc index 9188f0e2324..5a85f7a8061 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.cc +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.cc @@ -26,9 +26,9 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" -#include "BKE_mesh_runtime.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_mapping.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_particle.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc index 2ddcf82b82a..53688cec949 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc @@ -25,7 +25,7 @@ #include "BKE_editmesh.h" #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_screen.h" diff --git a/source/blender/modifiers/intern/MOD_lattice.cc b/source/blender/modifiers/intern/MOD_lattice.cc index 45439fa9962..22e506c0af0 100644 --- a/source/blender/modifiers/intern/MOD_lattice.cc +++ b/source/blender/modifiers/intern/MOD_lattice.cc @@ -21,8 +21,8 @@ #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index 09ae76faf48..850b6f52edc 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -11,8 +11,8 @@ #include "BKE_geometry_set.hh" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#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_volume.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc index 439d30021a8..212c78006ea 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.cc +++ b/source/blender/modifiers/intern/MOD_meshcache.cc @@ -28,7 +28,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc index 4d8d466558b..fc98cbea154 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.cc +++ b/source/blender/modifiers/intern/MOD_meshdeform.cc @@ -26,9 +26,9 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc index 3dad6b54570..9ad897ab575 100644 --- a/source/blender/modifiers/intern/MOD_mirror.cc +++ b/source/blender/modifiers/intern/MOD_mirror.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh_mirror.h" +#include "BKE_mesh_mirror.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index d89133b6439..80098ccebf7 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -24,14 +24,14 @@ #include "BKE_context.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_multires.h" -#include "BKE_paint.h" +#include "BKE_multires.hh" +#include "BKE_paint.hh" #include "BKE_screen.h" -#include "BKE_subdiv.h" -#include "BKE_subdiv_ccg.h" -#include "BKE_subdiv_deform.h" +#include "BKE_subdiv.hh" +#include "BKE_subdiv_ccg.hh" +#include "BKE_subdiv_deform.hh" #include "BKE_subdiv_mesh.hh" -#include "BKE_subsurf.h" +#include "BKE_subsurf.hh" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index 37ca1dc4979..a52c28432b0 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -22,7 +22,7 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_legacy_convert.h" +#include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc index 3dd25a03d25..e52e08f2dc6 100644 --- a/source/blender/modifiers/intern/MOD_remesh.cc +++ b/source/blender/modifiers/intern/MOD_remesh.cc @@ -23,8 +23,8 @@ #include "BKE_context.h" #include "BKE_mesh.hh" -#include "BKE_mesh_remesh_voxel.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_remesh_voxel.hh" +#include "BKE_mesh_runtime.hh" #include "BKE_screen.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_shrinkwrap.cc index 5f6100d86b4..51a20eac397 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.cc +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.cc @@ -21,8 +21,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" #include "BKE_shrinkwrap.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc index d0d9d639a7d..fba10b3fb17 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.cc +++ b/source/blender/modifiers/intern/MOD_simpledeform.cc @@ -22,8 +22,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc index 173dbce2b6e..d1f4af805ee 100644 --- a/source/blender/modifiers/intern/MOD_skin.cc +++ b/source/blender/modifiers/intern/MOD_skin.cc @@ -63,7 +63,7 @@ #include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_modifier.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.cc b/source/blender/modifiers/intern/MOD_smooth.cc index 1f2241b7caa..e4d762c88f6 100644 --- a/source/blender/modifiers/intern/MOD_smooth.cc +++ b/source/blender/modifiers/intern/MOD_smooth.cc @@ -25,7 +25,7 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_particle.h" #include "BKE_screen.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index 6287c8c537e..afd0e40ba69 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -28,12 +28,12 @@ #include "BKE_mesh.hh" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_subdiv.h" -#include "BKE_subdiv_ccg.h" -#include "BKE_subdiv_deform.h" +#include "BKE_subdiv.hh" +#include "BKE_subdiv_ccg.hh" +#include "BKE_subdiv_deform.hh" #include "BKE_subdiv_mesh.hh" -#include "BKE_subdiv_modifier.h" -#include "BKE_subsurf.h" +#include "BKE_subdiv_modifier.hh" +#include "BKE_subsurf.hh" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc index a01318ba1ab..1d7eda277f2 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.cc +++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc @@ -26,8 +26,8 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.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_screen.h" diff --git a/source/blender/modifiers/intern/MOD_util.cc b/source/blender/modifiers/intern/MOD_util.cc index 8a995dae7d9..a874e6fd843 100644 --- a/source/blender/modifiers/intern/MOD_util.cc +++ b/source/blender/modifiers/intern/MOD_util.cc @@ -28,7 +28,7 @@ #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_object.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 25b89b24477..54d51a1554b 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -8,7 +8,7 @@ #include "BKE_geometry_set.hh" #include "BKE_lib_query.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_texture.h" diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index f5174e03c7d..10fb2fca484 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -29,8 +29,8 @@ #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_mesh.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" #include "BKE_texture.h" diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index 96230cde071..b5ad50d032d 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -26,7 +26,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_texture.h" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc index b894c25bbad..70819c60065 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.cc +++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc @@ -26,7 +26,7 @@ #include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BKE_screen.h" #include "UI_interface.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index 5db132399c1..96bd066eb58 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -33,7 +33,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_screen.h" #include "BKE_texture.h" /* Texture masking. */ diff --git a/source/blender/modifiers/intern/MOD_wireframe.cc b/source/blender/modifiers/intern/MOD_wireframe.cc index 95d9bc4dba5..e79e190736a 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.cc +++ b/source/blender/modifiers/intern/MOD_wireframe.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_screen.h" #include "UI_interface.h" diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index 72c3f0c4bde..064bd8a2f1f 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -9,7 +9,7 @@ #include "DNA_meshdata_types.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_pointcloud.h" #include "NOD_add_node_search.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc index b9d73b4b138..25e9516fbf0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc @@ -18,7 +18,7 @@ #include "BKE_curves.hh" #include "BKE_geometry_fields.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc index 46c8218c3ea..1b33b1ade17 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc @@ -7,8 +7,8 @@ #include "BKE_editmesh.h" #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_type_conversions.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index 24464a76a49..011fa8ecb26 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -15,7 +15,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 "BKE_pointcloud.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc index 025e204ef6b..605a5cb0b77 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc @@ -10,7 +10,7 @@ #include "BKE_attribute_math.hh" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc b/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc index 1bb7bbe0db5..d7dcf7afd29 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_atomic_disjoint_set.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index 72bf96a2dde..ff4dc548cde 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -12,8 +12,8 @@ #include "BKE_attribute_math.hh" #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 "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc index 9981c2fd891..a5a6d760bed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "BKE_subdiv_mesh.hh" #include "UI_interface.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc index b5cddb69cc0..7ec0b6378c1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc @@ -6,9 +6,9 @@ #include "node_geometry_util.hh" #include "BKE_lib_id.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" -#include "BKE_mesh_wrapper.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_runtime.hh" +#include "BKE_mesh_wrapper.hh" #include "BKE_object.h" #include "BKE_volume.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index ef9d74cef7a..6e4831940ef 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -7,8 +7,8 @@ #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_object.h" #include "BKE_volume.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc index 046a72dfa89..435214d9b4c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_array_utils.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc index a19365748b3..c90d258c247 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_array_utils.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc index f67806f9cdb..b634fd35b34 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_task.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc index d892b5efd23..4c776d90232 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_array_utils.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc index 672f32580b8..c0cc533d3fe 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc index ffbfe2db708..0717cefd3da 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "BLI_task.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc index 16f761a41a8..549bf38560a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc @@ -8,7 +8,7 @@ #include "BKE_bvhutils.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index f9b18170793..8dfb12e5318 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -10,7 +10,7 @@ #include "BKE_attribute.hh" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "BKE_subdiv_mesh.hh" #include "UI_interface.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 7f4119cec77..75a01c600d7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -13,7 +13,7 @@ #include "BKE_lib_id.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh_runtime.hh" #include "BKE_volume.h" #include "BKE_volume_openvdb.hh" #include "BKE_volume_to_mesh.hh" diff --git a/source/blender/nodes/texture/node_texture_tree.cc b/source/blender/nodes/texture/node_texture_tree.cc index 5f0aefb5c6b..f9071691fb9 100644 --- a/source/blender/nodes/texture/node_texture_tree.cc +++ b/source/blender/nodes/texture/node_texture_tree.cc @@ -20,7 +20,7 @@ #include "BKE_layer.h" #include "BKE_linestyle.h" #include "BKE_node.hh" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "NOD_texture.h" #include "node_common.h" diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index e8a426951dc..4ed3d6f93f8 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -18,8 +18,8 @@ #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_lib_id.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" +#include "BKE_mesh.hh" +#include "BKE_mesh_runtime.hh" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc index 4d8f3334cad..786992fc67f 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.cc +++ b/source/blender/python/mathutils/mathutils_bvhtree.cc @@ -37,7 +37,7 @@ # include "BKE_editmesh_bvh.h" # include "BKE_lib_id.h" # include "BKE_mesh.hh" -# include "BKE_mesh_runtime.h" +# include "BKE_mesh_runtime.hh" # include "BKE_object.h" # include "DEG_depsgraph_query.h" diff --git a/source/blender/render/intern/bake.cc b/source/blender/render/intern/bake.cc index cab03e97339..85b3d745c03 100644 --- a/source/blender/render/intern/bake.cc +++ b/source/blender/render/intern/bake.cc @@ -64,8 +64,8 @@ #include "BKE_image.h" #include "BKE_lib_id.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_node.hh" #include "IMB_imbuf.h" diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc index cdcc4059f31..83d779158f1 100644 --- a/source/blender/render/intern/multires_bake.cc +++ b/source/blender/render/intern/multires_bake.cc @@ -26,10 +26,10 @@ #include "BKE_lib_id.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_mesh_tangent.h" +#include "BKE_mesh_tangent.hh" #include "BKE_modifier.h" -#include "BKE_multires.h" -#include "BKE_subsurf.h" +#include "BKE_multires.hh" +#include "BKE_subsurf.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index 08a4e7474fb..32e52efbb1f 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -15,7 +15,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_customdata.h" #include "BKE_mesh.hh" -#include "BKE_mesh_mapping.h" +#include "BKE_mesh_mapping.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/render/intern/texture_pointdensity.cc b/source/blender/render/intern/texture_pointdensity.cc index d6415b75515..50c693068b5 100644 --- a/source/blender/render/intern/texture_pointdensity.cc +++ b/source/blender/render/intern/texture_pointdensity.cc @@ -33,7 +33,7 @@ #include "BKE_customdata.h" #include "BKE_deform.h" #include "BKE_lattice.h" -#include "BKE_mesh.h" +#include "BKE_mesh.hh" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index 79b58963c84..30d05c6c79b 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -62,7 +62,7 @@ #include "UI_resources.h" #ifdef WITH_OPENSUBDIV -# include "BKE_subsurf.h" +# include "BKE_subsurf.hh" #endif /* -------------------------------------------------------------------- */ diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index d7ce6c224af..219f0e1668e 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -61,7 +61,7 @@ #include "BKE_mask.h" /* free mask clipboard */ #include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_studiolight.h" -#include "BKE_subdiv.h" +#include "BKE_subdiv.hh" #include "BKE_tracking.h" /* free tracking clipboard */ #include "RE_engine.h" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 2b494d8078c..5c0f003fd87 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -46,7 +46,7 @@ #include "BLI_utildefines.h" #include "BKE_anim_data.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/intern/wm_toolsystem.cc b/source/blender/windowmanager/intern/wm_toolsystem.cc index a0c5573e024..bc6d6590571 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.cc +++ b/source/blender/windowmanager/intern/wm_toolsystem.cc @@ -25,13 +25,13 @@ #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_paint.h" +#include "BKE_paint.hh" #include "BKE_workspace.h" #include "RNA_access.h" diff --git a/source/creator/creator.cc b/source/creator/creator.cc index 3d10057b357..680281d4a75 100644 --- a/source/creator/creator.cc +++ b/source/creator/creator.cc @@ -39,7 +39,7 @@ /* Mostly initialization functions. */ #include "BKE_appdir.h" #include "BKE_blender.h" -#include "BKE_brush.h" +#include "BKE_brush.hh" #include "BKE_cachefile.h" #include "BKE_callbacks.h" #include "BKE_context.h"