From 7a96c4672c3017b453dc96063af62f16d7d36ed8 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Tue, 5 Dec 2023 23:01:12 +0100 Subject: [PATCH] Cleanup: Move BMesh headers to C++ Pull Request: https://projects.blender.org/blender/blender/pulls/115817 --- source/blender/blenkernel/BKE_customdata.hh | 2 +- source/blender/blenkernel/BKE_editmesh.hh | 2 +- source/blender/blenkernel/BKE_paint.hh | 2 +- source/blender/blenkernel/BKE_pbvh_api.hh | 2 +- .../blender/blenkernel/intern/customdata.cc | 2 +- source/blender/blenkernel/intern/mesh_fair.cc | 4 +- .../blender/blenkernel/intern/mesh_mirror.cc | 4 +- .../blenkernel/intern/mesh_remesh_voxel.cc | 2 +- .../blenkernel/intern/multires_unsubdivide.cc | 2 +- source/blender/blenkernel/intern/paint.cc | 2 +- source/blender/blenkernel/intern/pbvh.cc | 2 +- .../blender/blenkernel/intern/pbvh_bmesh.cc | 2 +- .../blender/blenkernel/intern/pbvh_colors.cc | 2 +- source/blender/blenkernel/intern/scene.cc | 2 +- .../intern/subdiv_converter_mesh.cc | 2 +- source/blender/blenlib/BLI_task.h | 2 +- source/blender/bmesh/CMakeLists.txt | 110 +++++++++--------- source/blender/bmesh/{bmesh.h => bmesh.hh} | 68 +++++------ .../bmesh/{bmesh_class.h => bmesh_class.hh} | 8 -- source/blender/bmesh/bmesh_tools.h | 27 ----- source/blender/bmesh/bmesh_tools.hh | 27 +++++ .../bmesh/intern/bmesh_callback_generic.cc | 4 +- ...ck_generic.h => bmesh_callback_generic.hh} | 8 -- .../blender/bmesh/intern/bmesh_construct.cc | 4 +- .../{bmesh_construct.h => bmesh_construct.hh} | 10 +- source/blender/bmesh/intern/bmesh_core.cc | 4 +- .../intern/{bmesh_core.h => bmesh_core.hh} | 8 -- source/blender/bmesh/intern/bmesh_delete.cc | 4 +- .../{bmesh_delete.h => bmesh_delete.hh} | 8 -- source/blender/bmesh/intern/bmesh_edgeloop.cc | 4 +- .../{bmesh_edgeloop.h => bmesh_edgeloop.hh} | 8 -- .../intern/{bmesh_error.h => bmesh_error.hh} | 10 +- .../{bmesh_inline.h => bmesh_inline.hh} | 8 -- source/blender/bmesh/intern/bmesh_interp.cc | 4 +- .../{bmesh_interp.h => bmesh_interp.hh} | 8 -- .../blender/bmesh/intern/bmesh_iterators.cc | 4 +- .../{bmesh_iterators.h => bmesh_iterators.hh} | 15 +-- ...ors_inline.h => bmesh_iterators_inline.hh} | 8 -- source/blender/bmesh/intern/bmesh_log.cc | 4 +- .../intern/{bmesh_log.h => bmesh_log.hh} | 8 -- source/blender/bmesh/intern/bmesh_marking.cc | 6 +- .../{bmesh_marking.h => bmesh_marking.hh} | 8 -- source/blender/bmesh/intern/bmesh_mesh.cc | 2 +- .../intern/{bmesh_mesh.h => bmesh_mesh.hh} | 10 +- .../bmesh/intern/bmesh_mesh_convert.cc | 4 +- ...h_mesh_convert.h => bmesh_mesh_convert.hh} | 14 +-- .../blender/bmesh/intern/bmesh_mesh_debug.cc | 4 +- ...bmesh_mesh_debug.h => bmesh_mesh_debug.hh} | 10 +- .../bmesh/intern/bmesh_mesh_duplicate.cc | 4 +- ...sh_duplicate.h => bmesh_mesh_duplicate.hh} | 8 -- .../bmesh/intern/bmesh_mesh_normals.cc | 2 +- ...h_mesh_normals.h => bmesh_mesh_normals.hh} | 10 +- .../bmesh/intern/bmesh_mesh_partial_update.cc | 2 +- ..._update.h => bmesh_mesh_partial_update.hh} | 8 -- .../bmesh/intern/bmesh_mesh_tessellate.cc | 4 +- ..._tessellate.h => bmesh_mesh_tessellate.hh} | 8 -- .../bmesh/intern/bmesh_mesh_validate.cc | 4 +- ...mesh_validate.h => bmesh_mesh_validate.hh} | 8 -- source/blender/bmesh/intern/bmesh_mods.cc | 4 +- .../intern/{bmesh_mods.h => bmesh_mods.hh} | 10 +- .../blender/bmesh/intern/bmesh_opdefines.cc | 4 +- ...h_operator_api.h => bmesh_operator_api.hh} | 14 +-- ..._inline.h => bmesh_operator_api_inline.hh} | 8 -- .../blender/bmesh/intern/bmesh_operators.cc | 4 +- .../{bmesh_operators.h => bmesh_operators.hh} | 10 +- ...s_private.h => bmesh_operators_private.hh} | 8 -- source/blender/bmesh/intern/bmesh_polygon.cc | 6 +- .../{bmesh_polygon.h => bmesh_polygon.hh} | 8 -- .../bmesh/intern/bmesh_polygon_edgenet.cc | 4 +- ...gon_edgenet.h => bmesh_polygon_edgenet.hh} | 8 -- .../{bmesh_private.h => bmesh_private.hh} | 10 +- source/blender/bmesh/intern/bmesh_query.cc | 4 +- .../intern/{bmesh_query.h => bmesh_query.hh} | 10 +- ...h_query_inline.h => bmesh_query_inline.hh} | 8 -- source/blender/bmesh/intern/bmesh_query_uv.cc | 4 +- .../{bmesh_query_uv.h => bmesh_query_uv.hh} | 8 -- .../blender/bmesh/intern/bmesh_structure.cc | 4 +- .../{bmesh_structure.h => bmesh_structure.hh} | 10 +- ...ure_inline.h => bmesh_structure_inline.hh} | 8 -- source/blender/bmesh/intern/bmesh_walkers.cc | 4 +- .../{bmesh_walkers.h => bmesh_walkers.hh} | 8 -- .../bmesh/intern/bmesh_walkers_impl.cc | 4 +- ...ers_private.h => bmesh_walkers_private.hh} | 8 -- .../blender/bmesh/operators/bmo_beautify.cc | 6 +- source/blender/bmesh/operators/bmo_bevel.cc | 6 +- .../bmesh/operators/bmo_bisect_plane.cc | 6 +- source/blender/bmesh/operators/bmo_bridge.cc | 4 +- source/blender/bmesh/operators/bmo_connect.cc | 4 +- .../bmesh/operators/bmo_connect_concave.cc | 4 +- .../bmesh/operators/bmo_connect_nonplanar.cc | 4 +- .../bmesh/operators/bmo_connect_pair.cc | 4 +- source/blender/bmesh/operators/bmo_create.cc | 4 +- .../blender/bmesh/operators/bmo_dissolve.cc | 6 +- source/blender/bmesh/operators/bmo_dupe.cc | 4 +- source/blender/bmesh/operators/bmo_edgenet.cc | 6 +- source/blender/bmesh/operators/bmo_extrude.cc | 4 +- .../bmesh/operators/bmo_fill_attribute.cc | 4 +- .../bmesh/operators/bmo_fill_edgeloop.cc | 4 +- .../blender/bmesh/operators/bmo_fill_grid.cc | 4 +- .../blender/bmesh/operators/bmo_fill_holes.cc | 6 +- source/blender/bmesh/operators/bmo_hull.cc | 4 +- source/blender/bmesh/operators/bmo_inset.cc | 4 +- .../bmesh/operators/bmo_join_triangles.cc | 4 +- .../bmesh/operators/bmo_mesh_convert.cc | 4 +- source/blender/bmesh/operators/bmo_mirror.cc | 4 +- source/blender/bmesh/operators/bmo_normals.cc | 4 +- .../bmesh/operators/bmo_offset_edgeloops.cc | 4 +- .../bmesh/operators/bmo_planar_faces.cc | 4 +- source/blender/bmesh/operators/bmo_poke.cc | 4 +- .../blender/bmesh/operators/bmo_primitive.cc | 4 +- .../bmesh/operators/bmo_removedoubles.cc | 4 +- .../bmesh/operators/bmo_rotate_edges.cc | 4 +- .../bmesh/operators/bmo_smooth_laplacian.cc | 4 +- .../bmesh/operators/bmo_split_edges.cc | 6 +- .../blender/bmesh/operators/bmo_subdivide.cc | 6 +- .../bmesh/operators/bmo_subdivide_edgering.cc | 4 +- .../blender/bmesh/operators/bmo_symmetrize.cc | 4 +- .../bmesh/operators/bmo_triangulate.cc | 6 +- .../bmesh/operators/bmo_unsubdivide.cc | 6 +- source/blender/bmesh/operators/bmo_utils.cc | 4 +- .../blender/bmesh/operators/bmo_wireframe.cc | 6 +- source/blender/bmesh/tests/bmesh_core_test.cc | 2 +- source/blender/bmesh/tools/bmesh_beautify.cc | 4 +- .../{bmesh_beautify.h => bmesh_beautify.hh} | 8 -- source/blender/bmesh/tools/bmesh_bevel.cc | 8 +- .../tools/{bmesh_bevel.h => bmesh_bevel.hh} | 8 -- .../blender/bmesh/tools/bmesh_bisect_plane.cc | 4 +- ...h_bisect_plane.h => bmesh_bisect_plane.hh} | 8 -- source/blender/bmesh/tools/bmesh_boolean.cc | 9 +- .../{bmesh_boolean.h => bmesh_boolean.hh} | 8 -- .../{bmesh_decimate.h => bmesh_decimate.hh} | 8 -- .../bmesh/tools/bmesh_decimate_collapse.cc | 6 +- .../bmesh/tools/bmesh_decimate_dissolve.cc | 4 +- .../bmesh/tools/bmesh_decimate_unsubdivide.cc | 4 +- source/blender/bmesh/tools/bmesh_edgenet.cc | 4 +- .../{bmesh_edgenet.h => bmesh_edgenet.hh} | 8 -- source/blender/bmesh/tools/bmesh_edgesplit.cc | 4 +- .../{bmesh_edgesplit.h => bmesh_edgesplit.hh} | 8 -- source/blender/bmesh/tools/bmesh_intersect.cc | 8 +- .../{bmesh_intersect.h => bmesh_intersect.hh} | 8 -- .../bmesh/tools/bmesh_intersect_edges.cc | 4 +- ...rsect_edges.h => bmesh_intersect_edges.hh} | 8 -- source/blender/bmesh/tools/bmesh_path.cc | 4 +- .../tools/{bmesh_path.h => bmesh_path.hh} | 8 -- .../blender/bmesh/tools/bmesh_path_region.cc | 4 +- ...esh_path_region.h => bmesh_path_region.hh} | 8 -- .../bmesh/tools/bmesh_path_region_uv.cc | 4 +- ...th_region_uv.h => bmesh_path_region_uv.hh} | 8 -- source/blender/bmesh/tools/bmesh_path_uv.cc | 8 +- .../{bmesh_path_uv.h => bmesh_path_uv.hh} | 8 -- .../blender/bmesh/tools/bmesh_region_match.cc | 4 +- ...h_region_match.h => bmesh_region_match.hh} | 8 -- source/blender/bmesh/tools/bmesh_separate.cc | 6 +- .../{bmesh_separate.h => bmesh_separate.hh} | 8 -- .../blender/bmesh/tools/bmesh_triangulate.cc | 4 +- ...esh_triangulate.h => bmesh_triangulate.hh} | 8 -- source/blender/bmesh/tools/bmesh_wireframe.cc | 4 +- .../{bmesh_wireframe.h => bmesh_wireframe.hh} | 8 -- .../draw/intern/draw_cache_impl_mesh.cc | 2 +- .../blender/draw/intern/draw_manager_text.cc | 2 +- source/blender/draw/intern/draw_pbvh.cc | 2 +- .../editors/mesh/editmesh_attribute.cc | 2 +- .../editors/mesh/editmesh_automerge.cc | 2 +- .../editors/mesh/editmesh_intersect.cc | 8 +- .../editors/mesh/editmesh_mask_extract.cc | 2 +- source/blender/editors/mesh/editmesh_path.cc | 4 +- .../editors/mesh/editmesh_polybuild.cc | 2 +- source/blender/editors/mesh/editmesh_rip.cc | 4 +- .../blender/editors/mesh/editmesh_rip_edge.cc | 2 +- .../blender/editors/mesh/editmesh_select.cc | 2 +- source/blender/editors/mesh/editmesh_tools.cc | 2 +- .../editors/object/object_data_transform.cc | 2 +- .../editors/sculpt_paint/paint_hide.cc | 2 +- .../editors/sculpt_paint/paint_image_proj.cc | 2 +- .../editors/sculpt_paint/paint_mask.cc | 4 +- .../editors/sculpt_paint/paint_vertex.cc | 2 +- .../editors/sculpt_paint/paint_weight.cc | 2 +- source/blender/editors/sculpt_paint/sculpt.cc | 2 +- .../sculpt_paint/sculpt_automasking.cc | 2 +- .../sculpt_paint/sculpt_brush_types.cc | 2 +- .../editors/sculpt_paint/sculpt_cloth.cc | 2 +- .../editors/sculpt_paint/sculpt_dyntopo.cc | 4 +- .../editors/sculpt_paint/sculpt_expand.cc | 2 +- .../editors/sculpt_paint/sculpt_face_set.cc | 2 +- .../sculpt_paint/sculpt_filter_mask.cc | 2 +- .../sculpt_paint/sculpt_filter_mesh.cc | 2 +- .../editors/sculpt_paint/sculpt_geodesic.cc | 2 +- .../editors/sculpt_paint/sculpt_mask_init.cc | 2 +- .../sculpt_paint/sculpt_multiplane_scrape.cc | 2 +- .../editors/sculpt_paint/sculpt_ops.cc | 2 +- .../sculpt_paint/sculpt_paint_color.cc | 2 +- .../sculpt_paint/sculpt_paint_image.cc | 2 +- .../editors/sculpt_paint/sculpt_pose.cc | 2 +- .../editors/sculpt_paint/sculpt_smooth.cc | 2 +- .../editors/sculpt_paint/sculpt_transform.cc | 2 +- .../editors/sculpt_paint/sculpt_undo.cc | 2 +- .../spreadsheet_data_source_geometry.cc | 2 +- .../view3d_gizmo_preselect_type.cc | 2 +- .../editors/space_view3d/view3d_iterators.cc | 2 +- source/blender/editors/uvedit/uvedit_path.cc | 4 +- .../gpu/intern/gpu_shader_builder_stubs.cc | 2 +- .../io/alembic/exporter/abc_writer_mesh.cc | 4 +- source/blender/io/collada/collada_utils.cpp | 4 +- .../ply/exporter/ply_export_load_plydata.cc | 6 +- .../wavefront_obj/exporter/obj_export_mesh.cc | 4 +- source/blender/modifiers/intern/MOD_bevel.cc | 4 +- .../blender/modifiers/intern/MOD_boolean.cc | 8 +- .../blender/modifiers/intern/MOD_decimate.cc | 4 +- .../blender/modifiers/intern/MOD_edgesplit.cc | 4 +- source/blender/modifiers/intern/MOD_skin.cc | 2 +- .../modifiers/intern/MOD_triangulate.cc | 4 +- .../modifiers/intern/MOD_weighted_normal.cc | 2 +- .../blender/modifiers/intern/MOD_wireframe.cc | 4 +- .../node_geo_mesh_primitive_ico_sphere.cc | 2 +- .../geometry/nodes/node_geo_triangulate.cc | 4 +- source/blender/python/bmesh/bmesh_py_api.cc | 2 +- .../blender/python/bmesh/bmesh_py_geometry.cc | 2 +- source/blender/python/bmesh/bmesh_py_ops.cc | 2 +- .../blender/python/bmesh/bmesh_py_ops_call.cc | 2 +- source/blender/python/bmesh/bmesh_py_types.cc | 2 +- .../python/bmesh/bmesh_py_types_customdata.cc | 2 +- .../python/bmesh/bmesh_py_types_meshdata.cc | 2 +- .../python/bmesh/bmesh_py_types_select.cc | 2 +- source/blender/python/bmesh/bmesh_py_utils.cc | 2 +- .../python/mathutils/mathutils_bvhtree.cc | 2 +- 225 files changed, 428 insertions(+), 860 deletions(-) rename source/blender/bmesh/{bmesh.h => bmesh.hh} (85%) rename source/blender/bmesh/{bmesh_class.h => bmesh_class.hh} (99%) delete mode 100644 source/blender/bmesh/bmesh_tools.h create mode 100644 source/blender/bmesh/bmesh_tools.hh rename source/blender/bmesh/intern/{bmesh_callback_generic.h => bmesh_callback_generic.hh} (92%) rename source/blender/bmesh/intern/{bmesh_construct.h => bmesh_construct.hh} (98%) rename source/blender/bmesh/intern/{bmesh_core.h => bmesh_core.hh} (99%) rename source/blender/bmesh/intern/{bmesh_delete.h => bmesh_delete.hh} (90%) rename source/blender/bmesh/intern/{bmesh_edgeloop.h => bmesh_edgeloop.hh} (98%) rename source/blender/bmesh/intern/{bmesh_error.h => bmesh_error.hh} (96%) rename source/blender/bmesh/intern/{bmesh_inline.h => bmesh_inline.hh} (98%) rename source/blender/bmesh/intern/{bmesh_interp.h => bmesh_interp.hh} (98%) rename source/blender/bmesh/intern/{bmesh_iterators.h => bmesh_iterators.hh} (98%) rename source/blender/bmesh/intern/{bmesh_iterators_inline.h => bmesh_iterators_inline.hh} (98%) rename source/blender/bmesh/intern/{bmesh_log.h => bmesh_log.hh} (98%) rename source/blender/bmesh/intern/{bmesh_marking.h => bmesh_marking.hh} (99%) rename source/blender/bmesh/intern/{bmesh_mesh.h => bmesh_mesh.hh} (98%) rename source/blender/bmesh/intern/{bmesh_mesh_convert.h => bmesh_mesh_convert.hh} (95%) rename source/blender/bmesh/intern/{bmesh_mesh_debug.h => bmesh_mesh_debug.hh} (80%) rename source/blender/bmesh/intern/{bmesh_mesh_duplicate.h => bmesh_mesh_duplicate.hh} (88%) rename source/blender/bmesh/intern/{bmesh_mesh_normals.h => bmesh_mesh_normals.hh} (97%) rename source/blender/bmesh/intern/{bmesh_mesh_partial_update.h => bmesh_mesh_partial_update.hh} (97%) rename source/blender/bmesh/intern/{bmesh_mesh_tessellate.h => bmesh_mesh_tessellate.hh} (95%) rename source/blender/bmesh/intern/{bmesh_mesh_validate.h => bmesh_mesh_validate.hh} (83%) rename source/blender/bmesh/intern/{bmesh_mods.h => bmesh_mods.hh} (98%) rename source/blender/bmesh/intern/{bmesh_operator_api.h => bmesh_operator_api.hh} (99%) rename source/blender/bmesh/intern/{bmesh_operator_api_inline.h => bmesh_operator_api_inline.hh} (98%) rename source/blender/bmesh/intern/{bmesh_operators.h => bmesh_operators.hh} (97%) rename source/blender/bmesh/intern/{bmesh_operators_private.h => bmesh_operators_private.hh} (98%) rename source/blender/bmesh/intern/{bmesh_polygon.h => bmesh_polygon.hh} (99%) rename source/blender/bmesh/intern/{bmesh_polygon_edgenet.h => bmesh_polygon_edgenet.hh} (96%) rename source/blender/bmesh/intern/{bmesh_private.h => bmesh_private.hh} (96%) rename source/blender/bmesh/intern/{bmesh_query.h => bmesh_query.hh} (99%) rename source/blender/bmesh/intern/{bmesh_query_inline.h => bmesh_query_inline.hh} (98%) rename source/blender/bmesh/intern/{bmesh_query_uv.h => bmesh_query_uv.hh} (97%) rename source/blender/bmesh/intern/{bmesh_structure.h => bmesh_structure.hh} (97%) rename source/blender/bmesh/intern/{bmesh_structure_inline.h => bmesh_structure_inline.hh} (95%) rename source/blender/bmesh/intern/{bmesh_walkers.h => bmesh_walkers.hh} (98%) rename source/blender/bmesh/intern/{bmesh_walkers_private.h => bmesh_walkers_private.hh} (96%) rename source/blender/bmesh/tools/{bmesh_beautify.h => bmesh_beautify.hh} (94%) rename source/blender/bmesh/tools/{bmesh_bevel.h => bmesh_bevel.hh} (95%) rename source/blender/bmesh/tools/{bmesh_bisect_plane.h => bmesh_bisect_plane.hh} (90%) rename source/blender/bmesh/tools/{bmesh_boolean.h => bmesh_boolean.hh} (95%) rename source/blender/bmesh/tools/{bmesh_decimate.h => bmesh_decimate.hh} (96%) rename source/blender/bmesh/tools/{bmesh_edgenet.h => bmesh_edgenet.hh} (88%) rename source/blender/bmesh/tools/{bmesh_edgesplit.h => bmesh_edgesplit.hh} (84%) rename source/blender/bmesh/tools/{bmesh_intersect.h => bmesh_intersect.hh} (94%) rename source/blender/bmesh/tools/{bmesh_intersect_edges.h => bmesh_intersect_edges.hh} (78%) rename source/blender/bmesh/tools/{bmesh_path.h => bmesh_path.hh} (95%) rename source/blender/bmesh/tools/{bmesh_path_region.h => bmesh_path_region.hh} (95%) rename source/blender/bmesh/tools/{bmesh_path_region_uv.h => bmesh_path_region_uv.hh} (95%) rename source/blender/bmesh/tools/{bmesh_path_uv.h => bmesh_path_uv.hh} (95%) rename source/blender/bmesh/tools/{bmesh_region_match.h => bmesh_region_match.hh} (88%) rename source/blender/bmesh/tools/{bmesh_separate.h => bmesh_separate.hh} (80%) rename source/blender/bmesh/tools/{bmesh_triangulate.h => bmesh_triangulate.hh} (88%) rename source/blender/bmesh/tools/{bmesh_wireframe.h => bmesh_wireframe.hh} (93%) diff --git a/source/blender/blenkernel/BKE_customdata.hh b/source/blender/blenkernel/BKE_customdata.hh index ec30a38f4c8..c5ef528e142 100644 --- a/source/blender/blenkernel/BKE_customdata.hh +++ b/source/blender/blenkernel/BKE_customdata.hh @@ -43,7 +43,7 @@ using eCustomDataMask = uint64_t; /** * UV map related customdata offsets into BMesh attribute blocks. See #BM_uv_map_get_offsets. - * Defined in #BKE_customdata.hh to avoid including bmesh.h in many unrelated areas. + * Defined in #BKE_customdata.hh to avoid including bmesh.hh in many unrelated areas. * An offset of -1 means that the corresponding layer does not exist. */ struct BMUVOffsets { diff --git a/source/blender/blenkernel/BKE_editmesh.hh b/source/blender/blenkernel/BKE_editmesh.hh index 059e8d6d423..a4303fb8d50 100644 --- a/source/blender/blenkernel/BKE_editmesh.hh +++ b/source/blender/blenkernel/BKE_editmesh.hh @@ -13,7 +13,7 @@ */ #include "DNA_customdata_types.h" -#include "bmesh.h" +#include "bmesh.hh" struct BMLoop; struct BMPartialUpdate; diff --git a/source/blender/blenkernel/BKE_paint.hh b/source/blender/blenkernel/BKE_paint.hh index 22f1d7d05d1..9b8c9e952a3 100644 --- a/source/blender/blenkernel/BKE_paint.hh +++ b/source/blender/blenkernel/BKE_paint.hh @@ -25,7 +25,7 @@ #include "BKE_attribute.h" #include "BKE_pbvh.hh" -#include "bmesh.h" +#include "bmesh.hh" struct BMFace; struct BMesh; diff --git a/source/blender/blenkernel/BKE_pbvh_api.hh b/source/blender/blenkernel/BKE_pbvh_api.hh index d2f76bb5b57..beb7d928d7f 100644 --- a/source/blender/blenkernel/BKE_pbvh_api.hh +++ b/source/blender/blenkernel/BKE_pbvh_api.hh @@ -29,7 +29,7 @@ #include "BKE_ccg.h" #include "BKE_pbvh.hh" -#include "bmesh.h" +#include "bmesh.hh" struct BMLog; struct BMesh; diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 5e8500a80d9..3cf9a8f008c 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -54,7 +54,7 @@ #include "BLO_read_write.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "CLG_log.h" diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 03d8661b6cc..b4522d29953 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -23,8 +23,8 @@ #include "BKE_mesh_fair.hh" #include "BKE_mesh_mapping.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "MEM_guardedalloc.h" #include "eigen_capi.h" diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc index 806afaecbce..1dfff039083 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.cc +++ b/source/blender/blenkernel/intern/mesh_mirror.cc @@ -23,8 +23,8 @@ #include "BKE_mesh_mirror.hh" #include "BKE_modifier.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc index 70605dd6a0b..a9c95ee1b5b 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc +++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc @@ -39,7 +39,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_sample.hh" -#include "bmesh_tools.h" +#include "bmesh_tools.hh" #ifdef WITH_OPENVDB # include diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.cc b/source/blender/blenkernel/intern/multires_unsubdivide.cc index 3c7b0b4f929..a1e61ebb5a8 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.cc +++ b/source/blender/blenkernel/intern/multires_unsubdivide.cc @@ -29,7 +29,7 @@ #include "BKE_subdiv.hh" #include "BKE_subsurf.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 8d04300098a..8c6fdcc11bc 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -73,7 +73,7 @@ #include "BLO_read_write.hh" -#include "bmesh.h" +#include "bmesh.hh" using blender::float3; using blender::MutableSpan; diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 1255c5cc6e3..81529305344 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@ -41,7 +41,7 @@ #include "PIL_time.h" -#include "bmesh.h" +#include "bmesh.hh" #include "atomic_ops.h" diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.cc b/source/blender/blenkernel/intern/pbvh_bmesh.cc index 6e8628dfd12..6d0ee450ceb 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.cc +++ b/source/blender/blenkernel/intern/pbvh_bmesh.cc @@ -24,7 +24,7 @@ #include "DRW_pbvh.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "pbvh_intern.hh" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/pbvh_colors.cc b/source/blender/blenkernel/intern/pbvh_colors.cc index 3e4803abae4..b483b83e806 100644 --- a/source/blender/blenkernel/intern/pbvh_colors.cc +++ b/source/blender/blenkernel/intern/pbvh_colors.cc @@ -32,7 +32,7 @@ #include "PIL_time.h" -#include "bmesh.h" +#include "bmesh.hh" #include "atomic_ops.h" diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 7ff05244149..9506279d976 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -116,7 +116,7 @@ #include "DRW_engine.h" -#include "bmesh.h" +#include "bmesh.hh" CurveMapping *BKE_sculpt_default_cavity_curve() diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc index 250b9ebf9d3..f22cea02f19 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc @@ -25,7 +25,7 @@ #include "opensubdiv_capi.h" #include "opensubdiv_converter_capi.h" -#include "bmesh_class.h" +#include "bmesh_class.hh" /* Enable work-around for non-working CPU evaluator when using bilinear scheme. * This forces Catmark scheme with all edges marked as infinitely sharp. */ diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index 4a036439670..fc162b3d1bd 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -/* Use a define instead of `#pragma once` because of `bmesh_iterators_inline.h` */ +/* Use a define instead of `#pragma once` because of `bmesh_iterators_inline.hh` */ #ifndef __BLI_TASK_H__ #define __BLI_TASK_H__ diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 61bc1afcc2f..0e62b06ff00 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -56,111 +56,111 @@ set(SRC operators/bmo_wireframe.cc intern/bmesh_callback_generic.cc - intern/bmesh_callback_generic.h + intern/bmesh_callback_generic.hh intern/bmesh_construct.cc - intern/bmesh_construct.h + intern/bmesh_construct.hh intern/bmesh_core.cc - intern/bmesh_core.h + intern/bmesh_core.hh intern/bmesh_delete.cc - intern/bmesh_delete.h + intern/bmesh_delete.hh intern/bmesh_edgeloop.cc - intern/bmesh_edgeloop.h - intern/bmesh_inline.h + intern/bmesh_edgeloop.hh + intern/bmesh_inline.hh intern/bmesh_interp.cc - intern/bmesh_interp.h + intern/bmesh_interp.hh intern/bmesh_iterators.cc - intern/bmesh_iterators.h - intern/bmesh_iterators_inline.h + intern/bmesh_iterators.hh + intern/bmesh_iterators_inline.hh intern/bmesh_log.cc - intern/bmesh_log.h + intern/bmesh_log.hh intern/bmesh_marking.cc - intern/bmesh_marking.h + intern/bmesh_marking.hh intern/bmesh_mesh.cc - intern/bmesh_mesh.h + intern/bmesh_mesh.hh intern/bmesh_mesh_convert.cc - intern/bmesh_mesh_convert.h + intern/bmesh_mesh_convert.hh intern/bmesh_mesh_debug.cc - intern/bmesh_mesh_debug.h + intern/bmesh_mesh_debug.hh intern/bmesh_mesh_duplicate.cc - intern/bmesh_mesh_duplicate.h + intern/bmesh_mesh_duplicate.hh intern/bmesh_mesh_normals.cc - intern/bmesh_mesh_normals.h + intern/bmesh_mesh_normals.hh intern/bmesh_mesh_partial_update.cc - intern/bmesh_mesh_partial_update.h + intern/bmesh_mesh_partial_update.hh intern/bmesh_mesh_tessellate.cc - intern/bmesh_mesh_tessellate.h + intern/bmesh_mesh_tessellate.hh intern/bmesh_mesh_validate.cc - intern/bmesh_mesh_validate.h + intern/bmesh_mesh_validate.hh intern/bmesh_mods.cc - intern/bmesh_mods.h + intern/bmesh_mods.hh intern/bmesh_opdefines.cc - intern/bmesh_operator_api_inline.h + intern/bmesh_operator_api_inline.hh intern/bmesh_operators.cc - intern/bmesh_operators.h - intern/bmesh_operators_private.h + intern/bmesh_operators.hh + intern/bmesh_operators_private.hh intern/bmesh_polygon.cc - intern/bmesh_polygon.h + intern/bmesh_polygon.hh intern/bmesh_polygon_edgenet.cc - intern/bmesh_polygon_edgenet.h - intern/bmesh_private.h + intern/bmesh_polygon_edgenet.hh + intern/bmesh_private.hh intern/bmesh_query.cc - intern/bmesh_query.h - intern/bmesh_query_inline.h + intern/bmesh_query.hh + intern/bmesh_query_inline.hh intern/bmesh_query_uv.cc - intern/bmesh_query_uv.h + intern/bmesh_query_uv.hh intern/bmesh_structure.cc - intern/bmesh_structure.h - intern/bmesh_structure_inline.h + intern/bmesh_structure.hh + intern/bmesh_structure_inline.hh intern/bmesh_walkers.cc - intern/bmesh_walkers.h + intern/bmesh_walkers.hh intern/bmesh_walkers_impl.cc - intern/bmesh_walkers_private.h + intern/bmesh_walkers_private.hh - intern/bmesh_error.h - intern/bmesh_operator_api.h + intern/bmesh_error.hh + intern/bmesh_operator_api.hh tools/bmesh_beautify.cc - tools/bmesh_beautify.h + tools/bmesh_beautify.hh tools/bmesh_bevel.cc - tools/bmesh_bevel.h + tools/bmesh_bevel.hh tools/bmesh_bisect_plane.cc - tools/bmesh_bisect_plane.h + tools/bmesh_bisect_plane.hh tools/bmesh_boolean.cc - tools/bmesh_boolean.h - tools/bmesh_decimate.h + tools/bmesh_boolean.hh + tools/bmesh_decimate.hh tools/bmesh_decimate_collapse.cc tools/bmesh_decimate_dissolve.cc tools/bmesh_decimate_unsubdivide.cc tools/bmesh_edgenet.cc - tools/bmesh_edgenet.h + tools/bmesh_edgenet.hh tools/bmesh_edgesplit.cc - tools/bmesh_edgesplit.h + tools/bmesh_edgesplit.hh tools/bmesh_intersect.cc - tools/bmesh_intersect.h + tools/bmesh_intersect.hh tools/bmesh_intersect_edges.cc - tools/bmesh_intersect_edges.h + tools/bmesh_intersect_edges.hh tools/bmesh_path.cc - tools/bmesh_path.h + tools/bmesh_path.hh tools/bmesh_path_region.cc - tools/bmesh_path_region.h + tools/bmesh_path_region.hh tools/bmesh_path_region_uv.cc - tools/bmesh_path_region_uv.h + tools/bmesh_path_region_uv.hh tools/bmesh_path_uv.cc - tools/bmesh_path_uv.h + tools/bmesh_path_uv.hh tools/bmesh_region_match.cc - tools/bmesh_region_match.h + tools/bmesh_region_match.hh tools/bmesh_separate.cc - tools/bmesh_separate.h + tools/bmesh_separate.hh tools/bmesh_triangulate.cc - tools/bmesh_triangulate.h + tools/bmesh_triangulate.hh tools/bmesh_wireframe.cc - tools/bmesh_wireframe.h + tools/bmesh_wireframe.hh - bmesh_class.h + bmesh_class.hh # public includes - bmesh.h - bmesh_tools.h + bmesh.hh + bmesh_tools.hh ) set(LIB diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.hh similarity index 85% rename from source/blender/bmesh/bmesh.h rename to source/blender/bmesh/bmesh.hh index bff7986af6e..f1b9a30641d 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.hh @@ -67,7 +67,7 @@ * * These are accessible through the iterator api, which is covered later in this document * - * See source/blender/bmesh/bmesh_query.h for more misc. queries. + * See source/blender/bmesh/bmesh_query.hh for more misc. queries. * \section bm_api The BMesh API * * One of the goals of the BMesh API is to make it easy @@ -76,12 +76,12 @@ * \subsection bm_iter_api Iterator API * * Most topological queries in BMesh go through an iterator API (see Queries above). - * These are defined in bmesh_iterators.h. - * If you can, please use the #BM_ITER_MESH, #BM_ITER_ELEM macros in bmesh_iterators.h + * These are defined in bmesh_iterators.hh. + * If you can, please use the #BM_ITER_MESH, #BM_ITER_ELEM macros in bmesh_iterators.hh * \subsection bm_walker_api Walker API * * Topological queries that require a stack (e.g. recursive queries) go through the Walker API, - * which is defined in bmesh_walkers.h. Currently the "walkers" are hard-coded into the API, + * which is defined in bmesh_walkers.hh. Currently the "walkers" are hard-coded into the API, * though a mechanism for plugging in new walkers needs to be added at some point. * * Most topological queries should go through these two APIs; @@ -135,7 +135,7 @@ * \subsection bm_slot_iter Slot Iterators * * Access to element buffers or maps must go through the slot iterator api, - * defined in bmesh_operators.h. + * defined in bmesh_operators.hh. * Use #BMO_ITER where ever possible. * \subsection bm_elem_buf Element Buffers * @@ -176,41 +176,41 @@ */ #include "BKE_customdata.hh" -#include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.h uses */ +#include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.hh uses */ #include "DNA_listBase.h" /* selection history uses */ #include #include -#include "bmesh_class.h" +#include "bmesh_class.hh" /* include the rest of the API */ -#include "intern/bmesh_error.h" -#include "intern/bmesh_operator_api.h" +#include "intern/bmesh_error.hh" +#include "intern/bmesh_operator_api.hh" -#include "intern/bmesh_callback_generic.h" -#include "intern/bmesh_construct.h" -#include "intern/bmesh_core.h" -#include "intern/bmesh_delete.h" -#include "intern/bmesh_edgeloop.h" -#include "intern/bmesh_interp.h" -#include "intern/bmesh_iterators.h" -#include "intern/bmesh_log.h" -#include "intern/bmesh_marking.h" -#include "intern/bmesh_mesh.h" -#include "intern/bmesh_mesh_convert.h" -#include "intern/bmesh_mesh_debug.h" -#include "intern/bmesh_mesh_duplicate.h" -#include "intern/bmesh_mesh_normals.h" -#include "intern/bmesh_mesh_partial_update.h" -#include "intern/bmesh_mesh_tessellate.h" -#include "intern/bmesh_mesh_validate.h" -#include "intern/bmesh_mods.h" -#include "intern/bmesh_operators.h" -#include "intern/bmesh_polygon.h" -#include "intern/bmesh_polygon_edgenet.h" -#include "intern/bmesh_query.h" -#include "intern/bmesh_query_uv.h" -#include "intern/bmesh_walkers.h" +#include "intern/bmesh_callback_generic.hh" +#include "intern/bmesh_construct.hh" +#include "intern/bmesh_core.hh" +#include "intern/bmesh_delete.hh" +#include "intern/bmesh_edgeloop.hh" +#include "intern/bmesh_interp.hh" +#include "intern/bmesh_iterators.hh" +#include "intern/bmesh_log.hh" +#include "intern/bmesh_marking.hh" +#include "intern/bmesh_mesh.hh" +#include "intern/bmesh_mesh_convert.hh" +#include "intern/bmesh_mesh_debug.hh" +#include "intern/bmesh_mesh_duplicate.hh" +#include "intern/bmesh_mesh_normals.hh" +#include "intern/bmesh_mesh_partial_update.hh" +#include "intern/bmesh_mesh_tessellate.hh" +#include "intern/bmesh_mesh_validate.hh" +#include "intern/bmesh_mods.hh" +#include "intern/bmesh_operators.hh" +#include "intern/bmesh_polygon.hh" +#include "intern/bmesh_polygon_edgenet.hh" +#include "intern/bmesh_query.hh" +#include "intern/bmesh_query_uv.hh" +#include "intern/bmesh_walkers.hh" -#include "intern/bmesh_inline.h" +#include "intern/bmesh_inline.hh" diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.hh similarity index 99% rename from source/blender/bmesh/bmesh_class.h rename to source/blender/bmesh/bmesh_class.hh index f3eea22e63b..db3a854b31e 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.hh @@ -13,10 +13,6 @@ #include "BLI_assert.h" -#ifdef __cplusplus -extern "C" { -#endif - /* disable holes for now, * these are ifdef'd because they use more memory and can't be saved in DNA currently */ // #define USE_BMESH_HOLES @@ -674,7 +670,3 @@ typedef bool (*BMLoopPairFilterFunc)(const BMLoop *, const BMLoop *, void *user_ #else # define BM_OMP_LIMIT 10000 #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/bmesh_tools.h b/source/blender/bmesh/bmesh_tools.h deleted file mode 100644 index 642adc9bfc5..00000000000 --- a/source/blender/bmesh/bmesh_tools.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/** \file - * \ingroup bmesh - * - * Utility functions that operate directly on the BMesh, - * These can be used by both Modifiers and BMesh-Operators. - */ - -#include "tools/bmesh_beautify.h" -#include "tools/bmesh_bevel.h" -#include "tools/bmesh_bisect_plane.h" -#include "tools/bmesh_boolean.h" -#include "tools/bmesh_decimate.h" -#include "tools/bmesh_edgenet.h" -#include "tools/bmesh_edgesplit.h" -#include "tools/bmesh_path.h" -#include "tools/bmesh_path_region.h" -#include "tools/bmesh_path_region_uv.h" -#include "tools/bmesh_path_uv.h" -#include "tools/bmesh_region_match.h" -#include "tools/bmesh_separate.h" -#include "tools/bmesh_triangulate.h" diff --git a/source/blender/bmesh/bmesh_tools.hh b/source/blender/bmesh/bmesh_tools.hh new file mode 100644 index 00000000000..9bf0427e779 --- /dev/null +++ b/source/blender/bmesh/bmesh_tools.hh @@ -0,0 +1,27 @@ +/* SPDX-FileCopyrightText: 2023 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +/** \file + * \ingroup bmesh + * + * Utility functions that operate directly on the BMesh, + * These can be used by both Modifiers and BMesh-Operators. + */ + +#include "tools/bmesh_beautify.hh" +#include "tools/bmesh_bevel.hh" +#include "tools/bmesh_bisect_plane.hh" +#include "tools/bmesh_boolean.hh" +#include "tools/bmesh_decimate.hh" +#include "tools/bmesh_edgenet.hh" +#include "tools/bmesh_edgesplit.hh" +#include "tools/bmesh_path.hh" +#include "tools/bmesh_path_region.hh" +#include "tools/bmesh_path_region_uv.hh" +#include "tools/bmesh_path_uv.hh" +#include "tools/bmesh_region_match.hh" +#include "tools/bmesh_separate.hh" +#include "tools/bmesh_triangulate.hh" diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.cc b/source/blender/bmesh/intern/bmesh_callback_generic.cc index caeb7058d7d..e45a980e71b 100644 --- a/source/blender/bmesh/intern/bmesh_callback_generic.cc +++ b/source/blender/bmesh/intern/bmesh_callback_generic.cc @@ -10,9 +10,9 @@ #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_callback_generic.h" +#include "intern/bmesh_callback_generic.hh" bool BM_elem_cb_check_hflag_ex(BMElem *ele, void *user_data) { diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.h b/source/blender/bmesh/intern/bmesh_callback_generic.hh similarity index 92% rename from source/blender/bmesh/intern/bmesh_callback_generic.h rename to source/blender/bmesh/intern/bmesh_callback_generic.hh index ad728bbfba9..1d780ab28fd 100644 --- a/source/blender/bmesh/intern/bmesh_callback_generic.h +++ b/source/blender/bmesh/intern/bmesh_callback_generic.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - bool BM_elem_cb_check_hflag_enabled(BMElem *, void *user_data); bool BM_elem_cb_check_hflag_disabled(BMElem *, void *user_data); bool BM_elem_cb_check_hflag_ex(BMElem *, void *user_data); @@ -26,7 +22,3 @@ bool BM_elem_cb_check_elem_not_equal(BMElem *ele, void *user_data); #define BM_elem_cb_check_hflag_disabled_simple(type, hflag_n) \ (bool (*)(type, void *)) BM_elem_cb_check_hflag_disabled, POINTER_FROM_UINT(hflag_n) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_construct.cc b/source/blender/bmesh/intern/bmesh_construct.cc index 8c7eb31cdac..0ccf68e4bd2 100644 --- a/source/blender/bmesh/intern/bmesh_construct.cc +++ b/source/blender/bmesh/intern/bmesh_construct.cc @@ -20,8 +20,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" bool BM_verts_from_edges(BMVert **vert_arr, BMEdge **edge_arr, const int len) { diff --git a/source/blender/bmesh/intern/bmesh_construct.h b/source/blender/bmesh/intern/bmesh_construct.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_construct.h rename to source/blender/bmesh/intern/bmesh_construct.hh index 76a30c4a03a..c6a4857ed74 100644 --- a/source/blender/bmesh/intern/bmesh_construct.h +++ b/source/blender/bmesh/intern/bmesh_construct.hh @@ -8,15 +8,11 @@ * \ingroup bmesh */ -#include "bmesh_core.h" +#include "bmesh_core.hh" struct BMAllocTemplate; struct Mesh; -#ifdef __cplusplus -extern "C" { -#endif - /** * Fill in a vertex array from an edge array. * @@ -171,7 +167,3 @@ void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst, char htype, const struct BMAllocTemplate *allocsize); BMesh *BM_mesh_copy(BMesh *bm_old); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_core.cc b/source/blender/bmesh/intern/bmesh_core.cc index 9aeeeed6006..dc9e75099b4 100644 --- a/source/blender/bmesh/intern/bmesh_core.cc +++ b/source/blender/bmesh/intern/bmesh_core.cc @@ -23,8 +23,8 @@ #include "BKE_customdata.hh" #include "BKE_mesh.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" using blender::Vector; diff --git a/source/blender/bmesh/intern/bmesh_core.h b/source/blender/bmesh/intern/bmesh_core.hh similarity index 99% rename from source/blender/bmesh/intern/bmesh_core.h rename to source/blender/bmesh/intern/bmesh_core.hh index 2aa14b36d8d..8787813b8cb 100644 --- a/source/blender/bmesh/intern/bmesh_core.h +++ b/source/blender/bmesh/intern/bmesh_core.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - BMFace *BM_face_copy(BMesh *bm_dst, BMesh *bm_src, BMFace *f, bool copy_verts, bool copy_edges); typedef enum eBMCreateFlag { @@ -397,7 +393,3 @@ BMVert *bmesh_kernel_unglue_region_make_vert_multi(BMesh *bm, BMLoop **larr, int * isolated by calling #bmesh_kernel_edge_separate to segregate it radially. */ BMVert *bmesh_kernel_unglue_region_make_vert_multi_isolated(BMesh *bm, BMLoop *l_sep); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_delete.cc b/source/blender/bmesh/intern/bmesh_delete.cc index 59bc0cb1af4..afe0b4a8e3a 100644 --- a/source/blender/bmesh/intern/bmesh_delete.cc +++ b/source/blender/bmesh/intern/bmesh_delete.cc @@ -10,8 +10,8 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* BMO functions */ diff --git a/source/blender/bmesh/intern/bmesh_delete.h b/source/blender/bmesh/intern/bmesh_delete.hh similarity index 90% rename from source/blender/bmesh/intern/bmesh_delete.h rename to source/blender/bmesh/intern/bmesh_delete.hh index 4f81211d44e..64e1cb01435 100644 --- a/source/blender/bmesh/intern/bmesh_delete.h +++ b/source/blender/bmesh/intern/bmesh_delete.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - void BMO_mesh_delete_oflag_tagged(BMesh *bm, short oflag, char htype); void BM_mesh_delete_hflag_tagged(BMesh *bm, char hflag, char htype); @@ -25,7 +21,3 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, short oflag, int type); * not just the type being removed. */ void BM_mesh_delete_hflag_context(BMesh *bm, char hflag, int type); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.cc b/source/blender/bmesh/intern/bmesh_edgeloop.cc index 9490f92bacf..21289c99b77 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.cc +++ b/source/blender/bmesh/intern/bmesh_edgeloop.cc @@ -16,9 +16,9 @@ #include "BLI_stack.h" #include "BLI_utildefines_iter.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "bmesh_edgeloop.h" /* own include */ +#include "bmesh_edgeloop.hh" /* own include */ struct BMEdgeLoopStore { BMEdgeLoopStore *next, *prev; diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.h b/source/blender/bmesh/intern/bmesh_edgeloop.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_edgeloop.h rename to source/blender/bmesh/intern/bmesh_edgeloop.hh index 455e016053f..fa413ad0f59 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.h +++ b/source/blender/bmesh/intern/bmesh_edgeloop.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct BMEdgeLoopStore; struct GSet; struct ListBase; @@ -86,7 +82,3 @@ bool BM_edgeloop_overlap_check(struct BMEdgeLoopStore *el_store_a, #define BM_EDGELOOP_NEXT(el_store) \ (CHECK_TYPE_INLINE(el_store, struct BMEdgeLoopStore *), \ (struct BMEdgeLoopStore *)((LinkData *)el_store)->next) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.hh similarity index 96% rename from source/blender/bmesh/intern/bmesh_error.h rename to source/blender/bmesh/intern/bmesh_error.hh index 4e3948feba1..e971f599a84 100644 --- a/source/blender/bmesh/intern/bmesh_error.h +++ b/source/blender/bmesh/intern/bmesh_error.hh @@ -8,11 +8,7 @@ * \ingroup bmesh */ -#include "bmesh_operator_api.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "bmesh_operator_api.hh" /*----------- bmop error system ----------*/ @@ -93,7 +89,3 @@ void BMO_error_clear(BMesh *bm); _BMESH_DUMMY_ABORT(), \ NULL)) : \ NULL) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_inline.h rename to source/blender/bmesh/intern/bmesh_inline.hh index 820142269ef..7c2514444cc 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* stuff for dealing with header flags */ #define BM_elem_flag_test(ele, hflag) _bm_elem_flag_test(&(ele)->head, hflag) #define BM_elem_flag_test_bool(ele, hflag) _bm_elem_flag_test_bool(&(ele)->head, hflag) @@ -126,7 +122,3 @@ BLI_INLINE int _bm_elem_index_get(const BMHeader *head) { return head->index; } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_interp.cc b/source/blender/bmesh/intern/bmesh_interp.cc index 07fc4f57ab0..105f6c32766 100644 --- a/source/blender/bmesh/intern/bmesh_interp.cc +++ b/source/blender/bmesh/intern/bmesh_interp.cc @@ -25,8 +25,8 @@ #include "BKE_customdata.hh" #include "BKE_multires.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* edge and vertex share, currently there's no need to have different logic */ static void bm_data_interp_from_elem(CustomData *data_layer, diff --git a/source/blender/bmesh/intern/bmesh_interp.h b/source/blender/bmesh/intern/bmesh_interp.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_interp.h rename to source/blender/bmesh/intern/bmesh_interp.hh index 7cab028daf6..b2101ba8d45 100644 --- a/source/blender/bmesh/intern/bmesh_interp.h +++ b/source/blender/bmesh/intern/bmesh_interp.hh @@ -11,10 +11,6 @@ struct LinkNode; struct MemArena; -#ifdef __cplusplus -extern "C" { -#endif - void BM_loop_interp_multires_ex(BMesh *bm, BMLoop *l_dst, const BMFace *f_src, @@ -128,7 +124,3 @@ void BM_vert_loop_groups_data_layer_merge_weights(BMesh *bm, struct LinkNode *groups, int layer_n, const float *loop_weights); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_iterators.cc b/source/blender/bmesh/intern/bmesh_iterators.cc index 5db5f167a16..ab8fa7a7dce 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.cc +++ b/source/blender/bmesh/intern/bmesh_iterators.cc @@ -15,8 +15,8 @@ #include "BLI_bitmap.h" #include "BLI_utildefines.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" const char bm_iter_itype_htype_map[BM_ITYPE_MAX] = { '\0', diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_iterators.h rename to source/blender/bmesh/intern/bmesh_iterators.hh index 045c18c70b6..a08ade5d164 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.h +++ b/source/blender/bmesh/intern/bmesh_iterators.hh @@ -19,17 +19,10 @@ * of inspecting the structure directly. */ +#include "BLI_bit_span.hh" #include "BLI_compiler_attrs.h" #include "BLI_mempool.h" -#ifdef __cplusplus -# include "BLI_bit_span.hh" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - /* these iterator over all elements of a specific * type in the mesh. * @@ -287,11 +280,7 @@ BMITER_CB_DEF(loop_of_face); #undef BMITER_CB_DEF -#ifdef __cplusplus -} -#endif - -#include "intern/bmesh_iterators_inline.h" +#include "intern/bmesh_iterators_inline.hh" #define BM_ITER_CHECK_TYPE_DATA(data) \ CHECK_TYPE_ANY(data, void *, BMFace *, BMEdge *, BMVert *, BMLoop *, BMElem *) diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_iterators_inline.h rename to source/blender/bmesh/intern/bmesh_iterators_inline.hh index 86fa0706706..7d7042e2144 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* inline here optimizes out the switch statement when called with * constant values (which is very common), nicer for loop-in-loop situations */ @@ -201,7 +197,3 @@ BLI_INLINE void BM_iter_parallel(BMesh *bm, } #endif /* __BLI_TASK_H__ */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_log.cc b/source/blender/bmesh/intern/bmesh_log.cc index dbe691bb73a..4e2c10cec6a 100644 --- a/source/blender/bmesh/intern/bmesh_log.cc +++ b/source/blender/bmesh/intern/bmesh_log.cc @@ -27,8 +27,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "bmesh_log.h" +#include "bmesh.hh" +#include "bmesh_log.hh" #include "range_tree.h" #include "BLI_strict_flags.h" diff --git a/source/blender/bmesh/intern/bmesh_log.h b/source/blender/bmesh/intern/bmesh_log.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_log.h rename to source/blender/bmesh/intern/bmesh_log.hh index f166b6d5b62..be7a9e30a34 100644 --- a/source/blender/bmesh/intern/bmesh_log.h +++ b/source/blender/bmesh/intern/bmesh_log.hh @@ -16,10 +16,6 @@ struct RangeTreeUInt; typedef struct BMLog BMLog; typedef struct BMLogEntry BMLogEntry; -#ifdef __cplusplus -extern "C" { -#endif - /** * Allocate, initialize, and assign a new BMLog. */ @@ -215,7 +211,3 @@ BMLogEntry *BM_log_current_entry(BMLog *log); struct RangeTreeUInt *BM_log_unused_ids(BMLog *log); void BM_log_print_entry(BMesh *bm, BMLogEntry *entry); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index 1e8aa39e1e6..78c885e205e 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -23,11 +23,11 @@ #include "BLI_math_vector.h" #include "BLI_task.h" -#include "bmesh.h" -#include "bmesh_structure.h" +#include "bmesh.hh" +#include "bmesh_structure.hh" /* For '_FLAG_OVERLAP'. */ -#include "bmesh_private.h" +#include "bmesh_private.hh" /* -------------------------------------------------------------------- */ /** \name Recounting total selection. diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.hh similarity index 99% rename from source/blender/bmesh/intern/bmesh_marking.h rename to source/blender/bmesh/intern/bmesh_marking.hh index 09911c0c09a..4ef83657439 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - typedef struct BMEditSelection { struct BMEditSelection *next, *prev; BMElem *ele; @@ -194,7 +190,3 @@ void BM_select_history_merge_from_targetmap( (bm)->selected = _bm_prev_selected; \ } \ (void)0 - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh.cc b/source/blender/bmesh/intern/bmesh_mesh.cc index 144d1e015ff..a3e8307323f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.cc +++ b/source/blender/bmesh/intern/bmesh_mesh.cc @@ -21,7 +21,7 @@ #include "BKE_customdata.hh" #include "BKE_mesh.hh" -#include "bmesh.h" +#include "bmesh.hh" const BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512}; const BMAllocTemplate bm_mesh_chunksize_default = {512, 1024, 2048, 512}; diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_mesh.h rename to source/blender/bmesh/intern/bmesh_mesh.hh index 8c3fbcd0fc9..113d19e188b 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.hh @@ -8,11 +8,7 @@ * \ingroup bmesh */ -#include "bmesh_class.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "bmesh_class.hh" struct BMAllocTemplate; @@ -208,7 +204,3 @@ void BM_mesh_vert_coords_apply(BMesh *bm, const float (*vert_coords)[3]); void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm, const float (*vert_coords)[3], const float mat[4][4]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index 2022488a86b..026ce40d8b4 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -101,8 +101,8 @@ #include "DEG_depsgraph_query.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" /* For element checking. */ +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* For element checking. */ #include "CLG_log.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.h b/source/blender/bmesh/intern/bmesh_mesh_convert.hh similarity index 95% rename from source/blender/bmesh/intern/bmesh_mesh_convert.h rename to source/blender/bmesh/intern/bmesh_mesh_convert.hh index 60e5a38b6a7..8f1b342b303 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.h +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.hh @@ -8,21 +8,15 @@ * \ingroup bmesh */ -#include "bmesh.h" +#include "BLI_string_ref.hh" -#ifdef __cplusplus -# include "BLI_string_ref.hh" +#include "bmesh.hh" /** * \return Whether attributes with the given name are stored in special flags or fields in BMesh * rather than in the regular custom data blocks. */ bool BM_attribute_stored_in_bmesh_builtin(const blender::StringRef name); -#endif - -#ifdef __cplusplus -extern "C" { -#endif struct CustomData_MeshMasks; struct Main; @@ -101,7 +95,3 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, struct Mesh *me, const struct CustomData_MeshMasks *cd_mask_extra) ATTR_NONNULL(1, 2); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_debug.cc b/source/blender/bmesh/intern/bmesh_mesh_debug.cc index 0f4f21ffeb0..aca15c494c3 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_debug.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_debug.cc @@ -21,9 +21,9 @@ # include "BKE_customdata.hh" -# include "bmesh.h" +# include "bmesh.hh" -# include "bmesh_mesh_debug.h" +# include "bmesh_mesh_debug.hh" # include "BLI_dynstr.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_debug.h b/source/blender/bmesh/intern/bmesh_mesh_debug.hh similarity index 80% rename from source/blender/bmesh/intern/bmesh_mesh_debug.h rename to source/blender/bmesh/intern/bmesh_mesh_debug.hh index 6ff6dd6e8bd..e08cc216a32 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_debug.h +++ b/source/blender/bmesh/intern/bmesh_mesh_debug.hh @@ -10,17 +10,9 @@ #include "BLI_compiler_attrs.h" -#include "bmesh.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "bmesh.hh" #ifndef NDEBUG char *BM_mesh_debug_info(BMesh *bm) ATTR_NONNULL(1) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; void BM_mesh_debug_print(BMesh *bm) ATTR_NONNULL(1); #endif /* NDEBUG */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_duplicate.cc b/source/blender/bmesh/intern/bmesh_mesh_duplicate.cc index 71f18588deb..48e0e8cd041 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_duplicate.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_duplicate.cc @@ -15,8 +15,8 @@ #include "BLI_alloca.h" #include "BLI_math_vector.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" /* for element checking */ +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* for element checking */ static BMVert *bm_vert_copy(BMesh *bm_src, BMesh *bm_dst, BMVert *v_src) { diff --git a/source/blender/bmesh/intern/bmesh_mesh_duplicate.h b/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh similarity index 88% rename from source/blender/bmesh/intern/bmesh_mesh_duplicate.h rename to source/blender/bmesh/intern/bmesh_mesh_duplicate.hh index 5f4e16ec1a3..ebf41bcfa3e 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_duplicate.h +++ b/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Geometry must be completely isolated. */ @@ -23,7 +19,3 @@ void BM_mesh_copy_arrays(BMesh *bm_src, uint edges_src_len, BMFace **faces_src, uint faces_src_len); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.cc b/source/blender/bmesh/intern/bmesh_mesh_normals.cc index bdbd6ce1cc1..ccee6daddff 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.cc @@ -27,7 +27,7 @@ #include "BKE_global.h" #include "BKE_mesh.hh" -#include "intern/bmesh_private.h" +#include "intern/bmesh_private.hh" /* Smooth angle to use when tagging edges is disabled entirely. */ #define EDGE_TAG_FROM_SPLIT_ANGLE_BYPASS -FLT_MAX diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.h b/source/blender/bmesh/intern/bmesh_mesh_normals.hh similarity index 97% rename from source/blender/bmesh/intern/bmesh_mesh_normals.h rename to source/blender/bmesh/intern/bmesh_mesh_normals.hh index d56eddd83e5..ac2beb6f491 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.h +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.hh @@ -8,11 +8,7 @@ * \ingroup bmesh */ -#include "bmesh_class.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "bmesh_class.hh" struct BMPartialUpdate; @@ -106,7 +102,3 @@ void BM_custom_loop_normals_from_vector_layer(struct BMesh *bm, bool add_sharp_e * to keep same shading as with auto-smooth! */ void BM_edges_sharp_from_angle_set(BMesh *bm, float split_angle); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc b/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc index a0bf0af6a99..3ea4551b6c7 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc @@ -43,7 +43,7 @@ #include "BLI_bitmap.h" #include "BLI_math_vector.h" -#include "bmesh.h" +#include "bmesh.hh" /** * Grow by 1.5x (rounding up). diff --git a/source/blender/bmesh/intern/bmesh_mesh_partial_update.h b/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh similarity index 97% rename from source/blender/bmesh/intern/bmesh_mesh_partial_update.h rename to source/blender/bmesh/intern/bmesh_mesh_partial_update.hh index 4166314e822..1b23e96f042 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_partial_update.h +++ b/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh @@ -10,10 +10,6 @@ #include "BLI_compiler_attrs.h" -#ifdef __cplusplus -extern "C" { -#endif - /** * Parameters used to determine which kinds of data needs to be generated. */ @@ -89,7 +85,3 @@ BMPartialUpdate *BM_mesh_partial_create_from_verts_group_multi( ATTR_NONNULL(1, 2, 3) ATTR_WARN_UNUSED_RESULT; void BM_mesh_partial_destroy(BMPartialUpdate *bmpinfo) ATTR_NONNULL(1); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc index 7ff6fe952f0..a54f2b780ca 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc @@ -25,8 +25,8 @@ #include "BLI_polyfill_2d_beautify.h" #include "BLI_task.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" /** * On systems with 32+ cores, diff --git a/source/blender/bmesh/intern/bmesh_mesh_tessellate.h b/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh similarity index 95% rename from source/blender/bmesh/intern/bmesh_mesh_tessellate.h rename to source/blender/bmesh/intern/bmesh_mesh_tessellate.hh index 0bd5af594a4..de30f18977a 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_tessellate.h +++ b/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct BMPartialUpdate; struct BMeshCalcTessellation_Params { @@ -39,7 +35,3 @@ void BM_mesh_calc_tessellation_with_partial_ex(BMesh *bm, void BM_mesh_calc_tessellation_with_partial(BMesh *bm, BMLoop *(*looptris)[3], const struct BMPartialUpdate *bmpinfo); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.cc b/source/blender/bmesh/intern/bmesh_mesh_validate.cc index 750e2321a78..5037e203fb4 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_validate.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_validate.cc @@ -16,9 +16,9 @@ # include "BLI_set.hh" # include "BLI_utildefines.h" -# include "bmesh.h" +# include "bmesh.hh" -# include "bmesh_mesh_validate.h" +# include "bmesh_mesh_validate.hh" /* macro which inserts the function name */ # if defined __GNUC__ diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.h b/source/blender/bmesh/intern/bmesh_mesh_validate.hh similarity index 83% rename from source/blender/bmesh/intern/bmesh_mesh_validate.h rename to source/blender/bmesh/intern/bmesh_mesh_validate.hh index c4341da4d04..178c230f152 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_validate.h +++ b/source/blender/bmesh/intern/bmesh_mesh_validate.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Check of this #BMesh is valid, * this function can be slow since its intended to help with debugging. @@ -19,7 +15,3 @@ extern "C" { * \return true when the mesh is valid. */ bool BM_mesh_validate(BMesh *bm); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_mods.cc b/source/blender/bmesh/intern/bmesh_mods.cc index dcf9e848b57..f8ab9859f74 100644 --- a/source/blender/bmesh/intern/bmesh_mods.cc +++ b/source/blender/bmesh/intern/bmesh_mods.cc @@ -16,8 +16,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" using blender::Vector; diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_mods.h rename to source/blender/bmesh/intern/bmesh_mods.hh index 395f4655db7..0034d60a709 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * \brief Dissolve Vert * @@ -59,7 +55,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v); */ BMFace *BM_faces_join_pair(BMesh *bm, BMLoop *l_a, BMLoop *l_b, bool do_del); -/** see: bmesh_polygon_edgenet.h for #BM_face_split_edgenet */ +/** see: bmesh_polygon_edgenet.hh for #BM_face_split_edgenet */ /** * \brief Face Split @@ -264,7 +260,3 @@ enum { BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *l_sep); BMVert *BM_face_loop_separate_multi_isolated(BMesh *bm, BMLoop *l_sep); BMVert *BM_face_loop_separate_multi(BMesh *bm, BMLoop **larr, int larr_len); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_opdefines.cc b/source/blender/bmesh/intern/bmesh_opdefines.cc index 573119449c2..58f75e59b6b 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.cc +++ b/source/blender/bmesh/intern/bmesh_opdefines.cc @@ -37,8 +37,8 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" #include "DNA_modifier_types.h" diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.hh similarity index 99% rename from source/blender/bmesh/intern/bmesh_operator_api.h rename to source/blender/bmesh/intern/bmesh_operator_api.hh index 9afec4ecbae..27a06a38f34 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.hh @@ -12,10 +12,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - /** * operators represent logical, executable mesh modules. all topological * operations involving a bmesh has to go through them. @@ -31,8 +27,8 @@ extern "C" { * * each slot is identified by a slot code, as are each operator. * operators, and their slots, are defined in bmesh_opdefines.cc (with their - * execution functions prototyped in bmesh_operators_private.h), with all their - * operator code and slot codes defined in bmesh_operators.h. see + * execution functions prototyped in bmesh_operators_private.hh), with all their + * operator code and slot codes defined in bmesh_operators.hh. see * bmesh_opdefines.cc and the BMOpDefine struct for how to define new operators. * * in general, operators are fed arrays of elements, created using either @@ -49,7 +45,7 @@ extern "C" { * * \note when you read from an element slot array or mapping, you can either tool-flag * all the elements in it, or read them using an iterator API (which is semantically - * similar to the iterator api in bmesh_iterators.h). + * similar to the iterator api in bmesh_iterators.hh). * * \note only #BMLoop items can't be put into slots as with verts, edges & faces. */ @@ -834,7 +830,3 @@ bool BMO_iter_map_value_bool(BMOIter *iter); extern const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES]; int BMO_opcode_from_opname(const char *opname); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_operator_api_inline.h rename to source/blender/bmesh/intern/bmesh_operator_api_inline.hh index 253a8c9f2e0..fb62b4c5949 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* Tool Flag API: Tool code must never put junk in header flags (#BMHeader.hflag) * instead, use this API to set flags. * If you need to store a value per element, use a #GHash or a mapping slot to do it. */ @@ -222,7 +218,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE return NULL; } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_operators.cc b/source/blender/bmesh/intern/bmesh_operators.cc index c926e6eb29b..7ce964bc90a 100644 --- a/source/blender/bmesh/intern/bmesh_operators.cc +++ b/source/blender/bmesh/intern/bmesh_operators.cc @@ -20,8 +20,8 @@ #include "BLT_translation.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* forward declarations */ static void bmo_flag_layer_alloc(BMesh *bm); diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.hh similarity index 97% rename from source/blender/bmesh/intern/bmesh_operators.h rename to source/blender/bmesh/intern/bmesh_operators.hh index 170799e6db1..5b1d0f0f4dd 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.hh @@ -10,10 +10,6 @@ /* See comments in `intern/bmesh_opdefines.cc` for documentation of specific operators. */ -#ifdef __cplusplus -extern "C" { -#endif - /*--------defines/enumerations for specific operators-------*/ /* Quad `innervert` values. */ @@ -219,8 +215,4 @@ void BM_mesh_calc_uvs_cone(BMesh *bm, */ void BM_mesh_calc_uvs_cube(BMesh *bm, short oflag); -#include "intern/bmesh_operator_api_inline.h" - -#ifdef __cplusplus -} -#endif +#include "intern/bmesh_operator_api_inline.hh" diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_operators_private.h rename to source/blender/bmesh/intern/bmesh_operators_private.hh index dc263184cc2..823caa2e672 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct BMOperator; struct BMesh; @@ -95,7 +91,3 @@ void bmo_unsubdivide_exec(BMesh *bm, BMOperator *op); void bmo_weld_verts_exec(BMesh *bm, BMOperator *op); void bmo_wireframe_exec(BMesh *bm, BMOperator *op); void bmo_flip_quad_tessellation_exec(BMesh *bm, BMOperator *op); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_polygon.cc b/source/blender/bmesh/intern/bmesh_polygon.cc index 2b307fd9783..264782fd3cb 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.cc +++ b/source/blender/bmesh/intern/bmesh_polygon.cc @@ -26,12 +26,12 @@ #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "BKE_customdata.hh" -#include "intern/bmesh_private.h" +#include "intern/bmesh_private.hh" /** * \brief COMPUTE POLY NORMAL (BMFace) diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.hh similarity index 99% rename from source/blender/bmesh/intern/bmesh_polygon.h rename to source/blender/bmesh/intern/bmesh_polygon.hh index a698f3b5c4a..bda7b9dd8b6 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.hh @@ -12,10 +12,6 @@ struct Heap; #include "BLI_compiler_attrs.h" -#ifdef __cplusplus -extern "C" { -#endif - /** * For tools that insist on using triangles, ideally we would cache this data. * @@ -288,7 +284,3 @@ void BM_vert_tri_calc_tangent_edge(BMVert *verts[3], float r_tangent[3]); * \param r_tangent: Calculated unit length tangent (return value). */ void BM_vert_tri_calc_tangent_edge_pair(BMVert *verts[3], float r_tangent[3]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc b/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc index be5d4542a73..fb4bc710380 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc @@ -25,8 +25,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /* -------------------------------------------------------------------- */ /** \name Face Split Edge-Net diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.h b/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh similarity index 96% rename from source/blender/bmesh/intern/bmesh_polygon_edgenet.h rename to source/blender/bmesh/intern/bmesh_polygon_edgenet.hh index a550cf8e109..8170d6be2c7 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.h +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Splits a face into many smaller faces defined by an edge-net. * handle customdata and degenerate cases. @@ -44,7 +40,3 @@ bool BM_face_split_edgenet_connect_islands(BMesh *bm, BMEdge ***r_edge_net_new, uint *r_edge_net_new_len) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 6, 7, 8); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.hh similarity index 96% rename from source/blender/bmesh/intern/bmesh_private.h rename to source/blender/bmesh/intern/bmesh_private.hh index 087f13fe7c9..8a53f72ea84 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.hh @@ -12,10 +12,6 @@ * parts of the bmesh internals. */ -#ifdef __cplusplus -extern "C" { -#endif - /* returns positive nonzero on error */ #ifdef NDEBUG @@ -90,8 +86,4 @@ enum { void poly_rotate_plane(const float normal[3], float (*verts)[3], uint nverts); /* include the rest of our private declarations */ -#include "bmesh_structure.h" - -#ifdef __cplusplus -} -#endif +#include "bmesh_structure.hh" diff --git a/source/blender/bmesh/intern/bmesh_query.cc b/source/blender/bmesh/intern/bmesh_query.cc index 25e119e7001..8bdf2814767 100644 --- a/source/blender/bmesh/intern/bmesh_query.cc +++ b/source/blender/bmesh/intern/bmesh_query.cc @@ -25,8 +25,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" BMLoop *BM_face_other_edge_loop(BMFace *f, BMEdge *e, BMVert *v) { diff --git a/source/blender/bmesh/intern/bmesh_query.h b/source/blender/bmesh/intern/bmesh_query.hh similarity index 99% rename from source/blender/bmesh/intern/bmesh_query.h rename to source/blender/bmesh/intern/bmesh_query.hh index 3b2cb16269d..7ac0e53b464 100644 --- a/source/blender/bmesh/intern/bmesh_query.h +++ b/source/blender/bmesh/intern/bmesh_query.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Returns true if the vertex is used in a given face. */ @@ -776,8 +772,4 @@ int BM_mesh_calc_edge_groups_as_arrays(BMesh *bm, /* Not really any good place to put this. */ float bmesh_subd_falloff_calc(int falloff, float val) ATTR_WARN_UNUSED_RESULT; -#ifdef __cplusplus -} -#endif - -#include "bmesh_query_inline.h" +#include "bmesh_query_inline.hh" diff --git a/source/blender/bmesh/intern/bmesh_query_inline.h b/source/blender/bmesh/intern/bmesh_query_inline.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_query_inline.h rename to source/blender/bmesh/intern/bmesh_query_inline.hh index ab378b95092..5e4aaa5d724 100644 --- a/source/blender/bmesh/intern/bmesh_query_inline.h +++ b/source/blender/bmesh/intern/bmesh_query_inline.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /** * Returns whether or not a given vertex is * is part of a given edge. @@ -143,7 +139,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE bool BM_vert_is_wire_endpoint } return false; } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_query_uv.cc b/source/blender/bmesh/intern/bmesh_query_uv.cc index 559f0be2471..01340d77f84 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.cc +++ b/source/blender/bmesh/intern/bmesh_query_uv.cc @@ -20,8 +20,8 @@ #include "DNA_meshdata_types.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" BMUVOffsets BM_uv_map_get_offsets_from_layer(const BMesh *bm, const int layer) { diff --git a/source/blender/bmesh/intern/bmesh_query_uv.h b/source/blender/bmesh/intern/bmesh_query_uv.hh similarity index 97% rename from source/blender/bmesh/intern/bmesh_query_uv.h rename to source/blender/bmesh/intern/bmesh_query_uv.hh index 41d86d1a73f..1848f2dc199 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.h +++ b/source/blender/bmesh/intern/bmesh_query_uv.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Retrieve the custom data offsets for the UV map. * \param layer: The layer index (where 0 is the first UV map). @@ -86,7 +82,3 @@ bool BM_loop_uv_share_vert_check(BMLoop *l_a, bool BM_face_uv_point_inside_test(const BMFace *f, const float co[2], int cd_loop_uv_offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_structure.cc b/source/blender/bmesh/intern/bmesh_structure.cc index 65450d78dd8..dd28f0f925c 100644 --- a/source/blender/bmesh/intern/bmesh_structure.cc +++ b/source/blender/bmesh/intern/bmesh_structure.cc @@ -10,8 +10,8 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" /** * MISC utility functions. diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.hh similarity index 97% rename from source/blender/bmesh/intern/bmesh_structure.h rename to source/blender/bmesh/intern/bmesh_structure.hh index 4ef27634bdf..4b76136598b 100644 --- a/source/blender/bmesh/intern/bmesh_structure.h +++ b/source/blender/bmesh/intern/bmesh_structure.hh @@ -15,10 +15,6 @@ * descriptive comments. but seriously, don't use this stuff. */ -#ifdef __cplusplus -extern "C" { -#endif - /* LOOP CYCLE MANAGEMENT */ /*****loop cycle functions, e.g. loops surrounding a face**** */ bool bmesh_loop_validate(BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); @@ -139,8 +135,4 @@ BMEdge *bmesh_disk_edge_exists(const BMVert *v1, const BMVert *v2) ATTR_WARN_UNU ATTR_NONNULL(); bool bmesh_disk_validate(int len, BMEdge *e, BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -#ifdef __cplusplus -} -#endif - -#include "intern/bmesh_structure_inline.h" +#include "intern/bmesh_structure_inline.hh" diff --git a/source/blender/bmesh/intern/bmesh_structure_inline.h b/source/blender/bmesh/intern/bmesh_structure_inline.hh similarity index 95% rename from source/blender/bmesh/intern/bmesh_structure_inline.h rename to source/blender/bmesh/intern/bmesh_structure_inline.hh index ce7c76cc2e7..e42b81089b0 100644 --- a/source/blender/bmesh/intern/bmesh_structure_inline.h +++ b/source/blender/bmesh/intern/bmesh_structure_inline.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE BMDiskLink *bmesh_disk_edge_link_from_vert(const BMEdge *e, const BMVert *v) { @@ -63,7 +59,3 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2) BLI_INLINE BMEdge *bmesh_disk_edge_pr { return BM_DISK_EDGE_PREV(e, v); } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_walkers.cc b/source/blender/bmesh/intern/bmesh_walkers.cc index 9f0b4c22cb9..8c3eee23cfa 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.cc +++ b/source/blender/bmesh/intern/bmesh_walkers.cc @@ -33,9 +33,9 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "bmesh_walkers_private.h" +#include "bmesh_walkers_private.hh" void *BMW_begin(BMWalker *walker, void *start) { diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.hh similarity index 98% rename from source/blender/bmesh/intern/bmesh_walkers.h rename to source/blender/bmesh/intern/bmesh_walkers.hh index 8831e08cb82..58890e765b4 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /* * NOTE: do NOT modify topology while walking a mesh! */ @@ -174,7 +170,3 @@ enum { /* use with BMW_init, so as not to confuse with restrict flags */ #define BMW_NIL_LAY 0 - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.cc b/source/blender/bmesh/intern/bmesh_walkers_impl.cc index 21b441aff58..6326bd7012d 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.cc +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.cc @@ -14,8 +14,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_walkers_private.h" +#include "bmesh.hh" +#include "intern/bmesh_walkers_private.hh" /* Pop into stack memory (common operation). */ #define BMW_state_remove_r(walker, owalk) \ diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.h b/source/blender/bmesh/intern/bmesh_walkers_private.hh similarity index 96% rename from source/blender/bmesh/intern/bmesh_walkers_private.h rename to source/blender/bmesh/intern/bmesh_walkers_private.hh index 61d355b3c9d..9a8e0073e3a 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_private.h +++ b/source/blender/bmesh/intern/bmesh_walkers_private.hh @@ -10,10 +10,6 @@ * BMesh walker API. */ -#ifdef __cplusplus -extern "C" { -#endif - extern BMWalker *bm_walker_types[]; extern const int bm_totwalkers; @@ -92,7 +88,3 @@ typedef struct BMwConnectedVertexWalker { BMwGenericWalker header; BMVert *curvert; } BMwConnectedVertexWalker; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/operators/bmo_beautify.cc b/source/blender/bmesh/operators/bmo_beautify.cc index dd2650cc41c..8808be4fe4d 100644 --- a/source/blender/bmesh/operators/bmo_beautify.cc +++ b/source/blender/bmesh/operators/bmo_beautify.cc @@ -11,9 +11,9 @@ #include "MEM_guardedalloc.h" -#include "bmesh.h" -#include "bmesh_tools.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" +#include "intern/bmesh_operators_private.hh" #define ELE_NEW 1 #define FACE_MARK 2 diff --git a/source/blender/bmesh/operators/bmo_bevel.cc b/source/blender/bmesh/operators/bmo_bevel.cc index 58c839f1d20..c46a7b33195 100644 --- a/source/blender/bmesh/operators/bmo_bevel.cc +++ b/source/blender/bmesh/operators/bmo_bevel.cc @@ -12,10 +12,10 @@ #include "BKE_curveprofile.h" #include "DNA_curveprofile_types.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ void bmo_bevel_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.cc b/source/blender/bmesh/operators/bmo_bisect_plane.cc index 19f28c9d086..dcf6a8a1e57 100644 --- a/source/blender/bmesh/operators/bmo_bisect_plane.cc +++ b/source/blender/bmesh/operators/bmo_bisect_plane.cc @@ -15,10 +15,10 @@ #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define ELE_NEW 1 #define ELE_CUT 2 diff --git a/source/blender/bmesh/operators/bmo_bridge.cc b/source/blender/bmesh/operators/bmo_bridge.cc index c7c2a2f3b34..2b7b8b14abb 100644 --- a/source/blender/bmesh/operators/bmo_bridge.cc +++ b/source/blender/bmesh/operators/bmo_bridge.cc @@ -12,9 +12,9 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /** * TODO(@ideasman42): Many connected edge loops can cause an error attempting diff --git a/source/blender/bmesh/operators/bmo_connect.cc b/source/blender/bmesh/operators/bmo_connect.cc index dfdda78e680..68734a0abc1 100644 --- a/source/blender/bmesh/operators/bmo_connect.cc +++ b/source/blender/bmesh/operators/bmo_connect.cc @@ -13,9 +13,9 @@ #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define VERT_INPUT 1 diff --git a/source/blender/bmesh/operators/bmo_connect_concave.cc b/source/blender/bmesh/operators/bmo_connect_concave.cc index 1edf53214ce..ccd2db7f6c4 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.cc +++ b/source/blender/bmesh/operators/bmo_connect_concave.cc @@ -28,9 +28,9 @@ #include "BLI_polyfill_2d_beautify.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define EDGE_OUT (1 << 0) #define FACE_OUT (1 << 1) diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.cc b/source/blender/bmesh/operators/bmo_connect_nonplanar.cc index d3b1ca3e29e..184a90007ae 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.cc +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.cc @@ -13,9 +13,9 @@ #include "BLI_math_geom.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define EDGE_OUT (1 << 0) #define FACE_OUT (1 << 1) diff --git a/source/blender/bmesh/operators/bmo_connect_pair.cc b/source/blender/bmesh/operators/bmo_connect_pair.cc index a651ed5345a..c2cf6d3acaf 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.cc +++ b/source/blender/bmesh/operators/bmo_connect_pair.cc @@ -15,9 +15,9 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #include "BLI_mempool.h" diff --git a/source/blender/bmesh/operators/bmo_create.cc b/source/blender/bmesh/operators/bmo_create.cc index 06d755fa9c9..607e4af98d2 100644 --- a/source/blender/bmesh/operators/bmo_create.cc +++ b/source/blender/bmesh/operators/bmo_create.cc @@ -12,9 +12,9 @@ #include "BLI_listbase.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define ELE_NEW 1 #define ELE_OUT 2 diff --git a/source/blender/bmesh/operators/bmo_dissolve.cc b/source/blender/bmesh/operators/bmo_dissolve.cc index 0dd375bc22e..4ce95b85beb 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.cc +++ b/source/blender/bmesh/operators/bmo_dissolve.cc @@ -14,10 +14,10 @@ #include "BLI_stack.h" #include "BLI_vector.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" +#include "intern/bmesh_operators_private.hh" using blender::Vector; diff --git a/source/blender/bmesh/operators/bmo_dupe.cc b/source/blender/bmesh/operators/bmo_dupe.cc index 2b6ab768a2e..69faab212fd 100644 --- a/source/blender/bmesh/operators/bmo_dupe.cc +++ b/source/blender/bmesh/operators/bmo_dupe.cc @@ -15,9 +15,9 @@ #include "BLI_math_rotation.h" #include "BLI_math_vector.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /* local flag define */ #define DUPE_INPUT 1 /* input from operator */ diff --git a/source/blender/bmesh/operators/bmo_edgenet.cc b/source/blender/bmesh/operators/bmo_edgenet.cc index 076ff64eb51..4470344446e 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.cc +++ b/source/blender/bmesh/operators/bmo_edgenet.cc @@ -13,10 +13,10 @@ #include "BLI_math_vector.h" #include "BLI_vector.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ using blender::Vector; diff --git a/source/blender/bmesh/operators/bmo_extrude.cc b/source/blender/bmesh/operators/bmo_extrude.cc index 9accbb90117..576f90c9fa4 100644 --- a/source/blender/bmesh/operators/bmo_extrude.cc +++ b/source/blender/bmesh/operators/bmo_extrude.cc @@ -18,9 +18,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define USE_EDGE_REGION_FLAGS diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.cc b/source/blender/bmesh/operators/bmo_fill_attribute.cc index 4cbe68b5ffe..bc6fd204fb0 100644 --- a/source/blender/bmesh/operators/bmo_fill_attribute.cc +++ b/source/blender/bmesh/operators/bmo_fill_attribute.cc @@ -11,9 +11,9 @@ #include "BLI_linklist_stack.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /** * Check if all other loops are tagged. diff --git a/source/blender/bmesh/operators/bmo_fill_edgeloop.cc b/source/blender/bmesh/operators/bmo_fill_edgeloop.cc index eb0bea30064..0da0393e2d0 100644 --- a/source/blender/bmesh/operators/bmo_fill_edgeloop.cc +++ b/source/blender/bmesh/operators/bmo_fill_edgeloop.cc @@ -12,9 +12,9 @@ #include "BLI_listbase.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define VERT_USED 1 #define EDGE_MARK 2 diff --git a/source/blender/bmesh/operators/bmo_fill_grid.cc b/source/blender/bmesh/operators/bmo_fill_grid.cc index b597336f67a..a37a5109201 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.cc +++ b/source/blender/bmesh/operators/bmo_fill_grid.cc @@ -16,9 +16,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #include "BLI_strict_flags.h" diff --git a/source/blender/bmesh/operators/bmo_fill_holes.cc b/source/blender/bmesh/operators/bmo_fill_holes.cc index 7b063478dca..1b85630f13a 100644 --- a/source/blender/bmesh/operators/bmo_fill_holes.cc +++ b/source/blender/bmesh/operators/bmo_fill_holes.cc @@ -10,10 +10,10 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ void bmo_holes_fill_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/operators/bmo_hull.cc b/source/blender/bmesh/operators/bmo_hull.cc index b9ba01651e8..4191d0399c6 100644 --- a/source/blender/bmesh/operators/bmo_hull.cc +++ b/source/blender/bmesh/operators/bmo_hull.cc @@ -21,9 +21,9 @@ /* XXX: using 128 for totelem and `pchunk` of `mempool`, no idea what good * values would be though */ -# include "bmesh.h" +# include "bmesh.hh" -# include "intern/bmesh_operators_private.h" /* own include */ +# include "intern/bmesh_operators_private.hh" /* own include */ using blender::Vector; diff --git a/source/blender/bmesh/operators/bmo_inset.cc b/source/blender/bmesh/operators/bmo_inset.cc index c2981c466e6..a5e32d95e74 100644 --- a/source/blender/bmesh/operators/bmo_inset.cc +++ b/source/blender/bmesh/operators/bmo_inset.cc @@ -20,9 +20,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /* Merge loop-data that diverges, see: #41445 */ #define USE_LOOP_CUSTOMDATA_MERGE diff --git a/source/blender/bmesh/operators/bmo_join_triangles.cc b/source/blender/bmesh/operators/bmo_join_triangles.cc index 6e8c62d513a..21e8fa6f404 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.cc +++ b/source/blender/bmesh/operators/bmo_join_triangles.cc @@ -22,9 +22,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /** * \note Assumes edges are validated before reaching this point. diff --git a/source/blender/bmesh/operators/bmo_mesh_convert.cc b/source/blender/bmesh/operators/bmo_mesh_convert.cc index 3199a09422e..46e9f075c09 100644 --- a/source/blender/bmesh/operators/bmo_mesh_convert.cc +++ b/source/blender/bmesh/operators/bmo_mesh_convert.cc @@ -14,8 +14,8 @@ #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" #include "BKE_global.h" diff --git a/source/blender/bmesh/operators/bmo_mirror.cc b/source/blender/bmesh/operators/bmo_mirror.cc index 1e1275e840d..949b43fe2e8 100644 --- a/source/blender/bmesh/operators/bmo_mirror.cc +++ b/source/blender/bmesh/operators/bmo_mirror.cc @@ -14,8 +14,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" /* own include */ #define ELE_NEW 1 diff --git a/source/blender/bmesh/operators/bmo_normals.cc b/source/blender/bmesh/operators/bmo_normals.cc index 26c387905a2..ca0b41668de 100644 --- a/source/blender/bmesh/operators/bmo_normals.cc +++ b/source/blender/bmesh/operators/bmo_normals.cc @@ -13,9 +13,9 @@ #include "BLI_linklist_stack.h" #include "BLI_math_vector.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ /********* Right-hand faces implementation ****** */ diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.cc b/source/blender/bmesh/operators/bmo_offset_edgeloops.cc index cfe4571472c..b94cc1a6e12 100644 --- a/source/blender/bmesh/operators/bmo_offset_edgeloops.cc +++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.cc @@ -19,9 +19,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define USE_CAP_OPTION diff --git a/source/blender/bmesh/operators/bmo_planar_faces.cc b/source/blender/bmesh/operators/bmo_planar_faces.cc index 91f4d10a2cf..b96ce2a97a4 100644 --- a/source/blender/bmesh/operators/bmo_planar_faces.cc +++ b/source/blender/bmesh/operators/bmo_planar_faces.cc @@ -14,9 +14,9 @@ #include "BLI_math_geom.h" #include "BLI_math_vector.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define ELE_VERT_ADJUST (1 << 0) #define ELE_FACE_ADJUST (1 << 1) diff --git a/source/blender/bmesh/operators/bmo_poke.cc b/source/blender/bmesh/operators/bmo_poke.cc index 8bac9579723..f941fc26a49 100644 --- a/source/blender/bmesh/operators/bmo_poke.cc +++ b/source/blender/bmesh/operators/bmo_poke.cc @@ -10,9 +10,9 @@ * Splits a face into a triangle fan. */ -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #include "BLI_math_vector.h" diff --git a/source/blender/bmesh/operators/bmo_primitive.cc b/source/blender/bmesh/operators/bmo_primitive.cc index 79881f91067..8c24d8f55ce 100644 --- a/source/blender/bmesh/operators/bmo_primitive.cc +++ b/source/blender/bmesh/operators/bmo_primitive.cc @@ -19,8 +19,8 @@ #include "DNA_meshdata_types.h" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" /* ************************ primitives ******************* */ diff --git a/source/blender/bmesh/operators/bmo_removedoubles.cc b/source/blender/bmesh/operators/bmo_removedoubles.cc index 08727fcf825..5ae0f300547 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.cc +++ b/source/blender/bmesh/operators/bmo_removedoubles.cc @@ -19,8 +19,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op, BMOpSlot *slot_targetmap) { diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.cc b/source/blender/bmesh/operators/bmo_rotate_edges.cc index 093303de83f..679e62c294b 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.cc +++ b/source/blender/bmesh/operators/bmo_rotate_edges.cc @@ -12,9 +12,9 @@ #include "BLI_heap.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define EDGE_OUT 1 #define FACE_MARK 1 diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.cc b/source/blender/bmesh/operators/bmo_smooth_laplacian.cc index e222bda73af..361534dde8f 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.cc +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.cc @@ -15,9 +15,9 @@ #include "eigen_capi.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ // #define SMOOTH_LAPLACIAN_AREA_FACTOR 4.0f /* UNUSED */ // #define SMOOTH_LAPLACIAN_EDGE_FACTOR 2.0f /* UNUSED */ diff --git a/source/blender/bmesh/operators/bmo_split_edges.cc b/source/blender/bmesh/operators/bmo_split_edges.cc index 0b45d4d2ecd..34502a93190 100644 --- a/source/blender/bmesh/operators/bmo_split_edges.cc +++ b/source/blender/bmesh/operators/bmo_split_edges.cc @@ -10,10 +10,10 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ void bmo_split_edges_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/operators/bmo_subdivide.cc b/source/blender/bmesh/operators/bmo_subdivide.cc index 41be2b61f09..e82bb42310f 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.cc +++ b/source/blender/bmesh/operators/bmo_subdivide.cc @@ -21,9 +21,9 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" +#include "intern/bmesh_private.hh" using blender::Vector; diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc index d9f026069ff..07bccc1f243 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc @@ -31,9 +31,9 @@ #include "BKE_curve.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define VERT_SHARED (1 << 0) diff --git a/source/blender/bmesh/operators/bmo_symmetrize.cc b/source/blender/bmesh/operators/bmo_symmetrize.cc index 56f87048e0e..b7cc928a7eb 100644 --- a/source/blender/bmesh/operators/bmo_symmetrize.cc +++ b/source/blender/bmesh/operators/bmo_symmetrize.cc @@ -11,8 +11,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "bmesh.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "intern/bmesh_operators_private.hh" #define ELE_OUT 1 diff --git a/source/blender/bmesh/operators/bmo_triangulate.cc b/source/blender/bmesh/operators/bmo_triangulate.cc index 4f288ef522a..82d7a0c2752 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.cc +++ b/source/blender/bmesh/operators/bmo_triangulate.cc @@ -17,9 +17,9 @@ #include "BLI_scanfill.h" #include "BLI_sort_utils.h" -#include "bmesh.h" -#include "bmesh_tools.h" -#include "intern/bmesh_operators_private.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" +#include "intern/bmesh_operators_private.hh" #define ELE_NEW 1 #define EDGE_MARK 4 diff --git a/source/blender/bmesh/operators/bmo_unsubdivide.cc b/source/blender/bmesh/operators/bmo_unsubdivide.cc index 9ac8e98a52f..ab09932842f 100644 --- a/source/blender/bmesh/operators/bmo_unsubdivide.cc +++ b/source/blender/bmesh/operators/bmo_unsubdivide.cc @@ -11,10 +11,10 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ void bmo_unsubdivide_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/operators/bmo_utils.cc b/source/blender/bmesh/operators/bmo_utils.cc index cb14514d604..4aeb617af87 100644 --- a/source/blender/bmesh/operators/bmo_utils.cc +++ b/source/blender/bmesh/operators/bmo_utils.cc @@ -23,9 +23,9 @@ #include "BKE_customdata.hh" #include "BKE_object.hh" -#include "bmesh.h" +#include "bmesh.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ #define ELE_NEW 1 diff --git a/source/blender/bmesh/operators/bmo_wireframe.cc b/source/blender/bmesh/operators/bmo_wireframe.cc index ba877041bfb..3eae8d1299c 100644 --- a/source/blender/bmesh/operators/bmo_wireframe.cc +++ b/source/blender/bmesh/operators/bmo_wireframe.cc @@ -13,11 +13,11 @@ #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "tools/bmesh_wireframe.h" +#include "tools/bmesh_wireframe.hh" -#include "intern/bmesh_operators_private.h" /* own include */ +#include "intern/bmesh_operators_private.hh" /* own include */ void bmo_wireframe_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/bmesh/tests/bmesh_core_test.cc b/source/blender/bmesh/tests/bmesh_core_test.cc index 1743b5c08f2..a19bf93fba1 100644 --- a/source/blender/bmesh/tests/bmesh_core_test.cc +++ b/source/blender/bmesh/tests/bmesh_core_test.cc @@ -6,7 +6,7 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" TEST(bmesh_core, BMVertCreate) { diff --git a/source/blender/bmesh/tools/bmesh_beautify.cc b/source/blender/bmesh/tools/bmesh_beautify.cc index 61dee8e85fc..4c2fd979be4 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.cc +++ b/source/blender/bmesh/tools/bmesh_beautify.cc @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "bmesh.h" -#include "bmesh_beautify.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_beautify.hh" /* own include */ // #define DEBUG_TIME diff --git a/source/blender/bmesh/tools/bmesh_beautify.h b/source/blender/bmesh/tools/bmesh_beautify.hh similarity index 94% rename from source/blender/bmesh/tools/bmesh_beautify.h rename to source/blender/bmesh/tools/bmesh_beautify.hh index 9bee050eb0e..f9aba8ed9c3 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.h +++ b/source/blender/bmesh/tools/bmesh_beautify.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - enum { /** Vertices tags must match (special case). */ VERT_RESTRICT_TAG = (1 << 0), @@ -42,7 +38,3 @@ float BM_verts_calc_rotate_beauty(const BMVert *v1, const BMVert *v4, short flag, short method); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_bevel.cc b/source/blender/bmesh/tools/bmesh_bevel.cc index b92da3d1957..4d26e7b6606 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.cc +++ b/source/blender/bmesh/tools/bmesh_bevel.cc @@ -31,10 +31,10 @@ #include "eigen_capi.h" -#include "bmesh.h" -#include "bmesh_bevel.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_bevel.hh" /* own include */ -#include "./intern/bmesh_private.h" +#include "./intern/bmesh_private.hh" using blender::Vector; @@ -331,7 +331,7 @@ struct BevelParams { BMesh *bm; /** Blender units to offset each side of a beveled edge. */ float offset; - /** How offset is measured; enum defined in bmesh_operators.h. */ + /** How offset is measured; enum defined in bmesh_operators.hh. */ int offset_type; /** Profile type: radius, superellipse, or custom */ int profile_type; diff --git a/source/blender/bmesh/tools/bmesh_bevel.h b/source/blender/bmesh/tools/bmesh_bevel.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_bevel.h rename to source/blender/bmesh/tools/bmesh_bevel.hh index 2f9f15e3bc5..54b58eaceba 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.h +++ b/source/blender/bmesh/tools/bmesh_bevel.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct CurveProfile; struct MDeformVert; @@ -49,7 +45,3 @@ void BM_mesh_bevel(BMesh *bm, float spread, const struct CurveProfile *custom_profile, int vmesh_method); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.cc b/source/blender/bmesh/tools/bmesh_bisect_plane.cc index ff703097df7..545c8c2a0ea 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.cc +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.cc @@ -28,8 +28,8 @@ #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" -#include "bmesh.h" -#include "bmesh_bisect_plane.h" /* Own include. */ +#include "bmesh.hh" +#include "bmesh_bisect_plane.hh" /* Own include. */ #include "BLI_strict_flags.h" /* Keep last. */ diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.h b/source/blender/bmesh/tools/bmesh_bisect_plane.hh similarity index 90% rename from source/blender/bmesh/tools/bmesh_bisect_plane.h rename to source/blender/bmesh/tools/bmesh_bisect_plane.hh index fc418f826c3..a625c078cb8 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.h +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * \param use_snap_center: Snap verts onto the plane. * \param use_tag: Only bisect tagged edges and faces. @@ -24,7 +20,3 @@ void BM_mesh_bisect_plane(BMesh *bm, short oflag_center, short oflag_new, float eps); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc index e211b64c5df..ab68663ad30 100644 --- a/source/blender/bmesh/tools/bmesh_boolean.cc +++ b/source/blender/bmesh/tools/bmesh_boolean.cc @@ -13,9 +13,9 @@ #include "BLI_mesh_boolean.hh" #include "BLI_mesh_intersect.hh" -#include "bmesh.h" -#include "bmesh_boolean.h" -#include "bmesh_edgesplit.h" +#include "bmesh.hh" +#include "bmesh_boolean.hh" +#include "bmesh_edgesplit.hh" #include "PIL_time.h" @@ -402,7 +402,6 @@ static bool bmesh_boolean(BMesh *bm, } // namespace blender::meshintersect -extern "C" { /** * Perform the boolean operation specified by boolean_mode on the mesh bm. * The inputs to the boolean operation are either one sub-mesh (if use_self is true), @@ -507,5 +506,3 @@ bool BM_mesh_boolean_knife(BMesh * /*bm*/, return false; } #endif - -} /* extern "C" */ diff --git a/source/blender/bmesh/tools/bmesh_boolean.h b/source/blender/bmesh/tools/bmesh_boolean.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_boolean.h rename to source/blender/bmesh/tools/bmesh_boolean.hh index 9bd6ec959b3..e52bf6c0611 100644 --- a/source/blender/bmesh/tools/bmesh_boolean.h +++ b/source/blender/bmesh/tools/bmesh_boolean.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - bool BM_mesh_boolean(BMesh *bm, struct BMLoop *(*looptris)[3], int looptris_tot, @@ -43,7 +39,3 @@ bool BM_mesh_boolean_knife(BMesh *bm, bool use_separate_all, bool hole_tolerant, bool keep_hidden); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_decimate.h b/source/blender/bmesh/tools/bmesh_decimate.hh similarity index 96% rename from source/blender/bmesh/tools/bmesh_decimate.h rename to source/blender/bmesh/tools/bmesh_decimate.hh index 37ec34d90b5..e45885cdd3f 100644 --- a/source/blender/bmesh/tools/bmesh_decimate.h +++ b/source/blender/bmesh/tools/bmesh_decimate.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * \brief BM_mesh_decimate * \param bm: The mesh @@ -53,7 +49,3 @@ void BM_mesh_decimate_dissolve(BMesh *bm, float angle_limit, bool do_dissolve_boundaries, const BMO_Delimit delimit); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc index 1b44b0d23df..29abdee397c 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc @@ -25,10 +25,10 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "bmesh_decimate.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_decimate.hh" /* own include */ -#include "../intern/bmesh_structure.h" +#include "../intern/bmesh_structure.hh" #define USE_SYMMETRY #ifdef USE_SYMMETRY diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc b/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc index d4f30785779..fdf5e288df0 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc @@ -17,8 +17,8 @@ #include "BKE_customdata.hh" -#include "bmesh.h" -#include "bmesh_decimate.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_decimate.hh" /* own include */ /* check that collapsing a vertex between 2 edges doesn't cause a degenerate face. */ #define USE_DEGENERATE_CHECK diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc index 053de9b35d7..473c82a8c04 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc @@ -10,8 +10,8 @@ #include "MEM_guardedalloc.h" -#include "bmesh.h" -#include "bmesh_decimate.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_decimate.hh" /* own include */ static bool bm_vert_dissolve_fan_test(BMVert *v) { diff --git a/source/blender/bmesh/tools/bmesh_edgenet.cc b/source/blender/bmesh/tools/bmesh_edgenet.cc index 8c8e23add71..ac461cb5002 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.cc +++ b/source/blender/bmesh/tools/bmesh_edgenet.cc @@ -17,8 +17,8 @@ #include "BLI_mempool.h" #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_edgenet.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_edgenet.hh" /* own include */ #include "BLI_strict_flags.h" /* keep last */ diff --git a/source/blender/bmesh/tools/bmesh_edgenet.h b/source/blender/bmesh/tools/bmesh_edgenet.hh similarity index 88% rename from source/blender/bmesh/tools/bmesh_edgenet.h rename to source/blender/bmesh/tools/bmesh_edgenet.hh index 9702b5dbf87..939166b4a51 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.h +++ b/source/blender/bmesh/tools/bmesh_edgenet.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Fill in faces from an edgenet made up of boundary and wire edges. * @@ -22,7 +18,3 @@ extern "C" { * \param use_edge_tag: Only fill tagged edges. */ void BM_mesh_edgenet(BMesh *bm, bool use_edge_tag, bool use_new_face_tag); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.cc b/source/blender/bmesh/tools/bmesh_edgesplit.cc index 08526b1040f..f288f982295 100644 --- a/source/blender/bmesh/tools/bmesh_edgesplit.cc +++ b/source/blender/bmesh/tools/bmesh_edgesplit.cc @@ -13,9 +13,9 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "bmesh_edgesplit.h" /* own include */ +#include "bmesh_edgesplit.hh" /* own include */ void BM_mesh_edgesplit(BMesh *bm, const bool use_verts, diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.h b/source/blender/bmesh/tools/bmesh_edgesplit.hh similarity index 84% rename from source/blender/bmesh/tools/bmesh_edgesplit.h rename to source/blender/bmesh/tools/bmesh_edgesplit.hh index 5ec743a9705..ff58c0da0a0 100644 --- a/source/blender/bmesh/tools/bmesh_edgesplit.h +++ b/source/blender/bmesh/tools/bmesh_edgesplit.hh @@ -8,17 +8,9 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * \param use_verts: Use flagged verts instead of edges. * \param tag_only: Only split tagged edges. * \param copy_select: Copy selection history. */ void BM_mesh_edgesplit(BMesh *bm, bool use_verts, bool tag_only, bool copy_select); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_intersect.cc b/source/blender/bmesh/tools/bmesh_intersect.cc index 59380185405..c5525babfe3 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.cc +++ b/source/blender/bmesh/tools/bmesh_intersect.cc @@ -36,12 +36,12 @@ #include "BLI_buffer.h" #include "BLI_kdopbvh.h" -#include "bmesh.h" -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "intern/bmesh_private.hh" -#include "bmesh_intersect.h" /* own include */ +#include "bmesh_intersect.hh" /* own include */ -#include "tools/bmesh_edgesplit.h" +#include "tools/bmesh_edgesplit.hh" #include "BLI_strict_flags.h" diff --git a/source/blender/bmesh/tools/bmesh_intersect.h b/source/blender/bmesh/tools/bmesh_intersect.hh similarity index 94% rename from source/blender/bmesh/tools/bmesh_intersect.h rename to source/blender/bmesh/tools/bmesh_intersect.hh index d8befb35aa4..b237cac5cef 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.h +++ b/source/blender/bmesh/tools/bmesh_intersect.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Intersect tessellated faces * leaving the resulting edges tagged. @@ -41,7 +37,3 @@ enum { BMESH_ISECT_BOOLEAN_UNION = 1, BMESH_ISECT_BOOLEAN_DIFFERENCE = 2, }; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.cc b/source/blender/bmesh/tools/bmesh_intersect_edges.cc index b899bdd83d6..e2df87686e4 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.cc +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.cc @@ -17,9 +17,9 @@ #include "atomic_ops.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "bmesh_intersect_edges.h" /* own include */ +#include "bmesh_intersect_edges.hh" /* own include */ //#define INTERSECT_EDGES_DEBUG diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.h b/source/blender/bmesh/tools/bmesh_intersect_edges.hh similarity index 78% rename from source/blender/bmesh/tools/bmesh_intersect_edges.h rename to source/blender/bmesh/tools/bmesh_intersect_edges.hh index 5ecb8c1f877..56c64334eba 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.h +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.hh @@ -8,13 +8,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool BM_mesh_intersect_edges( BMesh *bm, char hflag, float dist, bool split_faces, GHash *r_targetmap); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_path.cc b/source/blender/bmesh/tools/bmesh_path.cc index d7fd2e76dd8..0732f9d2384 100644 --- a/source/blender/bmesh/tools/bmesh_path.cc +++ b/source/blender/bmesh/tools/bmesh_path.cc @@ -17,8 +17,8 @@ #include "BLI_math_geom.h" #include "BLI_math_vector.h" -#include "bmesh.h" -#include "bmesh_path.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_path.hh" /* own include */ #define COST_INIT_MAX FLT_MAX diff --git a/source/blender/bmesh/tools/bmesh_path.h b/source/blender/bmesh/tools/bmesh_path.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_path.h rename to source/blender/bmesh/tools/bmesh_path.hh index af7512986ca..1e138845197 100644 --- a/source/blender/bmesh/tools/bmesh_path.h +++ b/source/blender/bmesh/tools/bmesh_path.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct BMCalcPathParams { uint use_topology_distance : 1; uint use_step_face : 1; @@ -40,7 +36,3 @@ struct LinkNode *BM_mesh_calc_path_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_path_region.cc b/source/blender/bmesh/tools/bmesh_path_region.cc index d20f9ba784a..4b2f64ec4ac 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.cc +++ b/source/blender/bmesh/tools/bmesh_path_region.cc @@ -16,8 +16,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" -#include "bmesh.h" -#include "bmesh_path_region.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_path_region.hh" /* own include */ /** * Special handling of vertices with 2 edges diff --git a/source/blender/bmesh/tools/bmesh_path_region.h b/source/blender/bmesh/tools/bmesh_path_region.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_path_region.h rename to source/blender/bmesh/tools/bmesh_path_region.hh index cc3ca529816..50264e07f7d 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.h +++ b/source/blender/bmesh/tools/bmesh_path_region.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct LinkNode *BM_mesh_calc_path_region_vert(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, @@ -32,7 +28,3 @@ struct LinkNode *BM_mesh_calc_path_region_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.cc b/source/blender/bmesh/tools/bmesh_path_region_uv.cc index 0734798aa08..2b54a504c1f 100644 --- a/source/blender/bmesh/tools/bmesh_path_region_uv.cc +++ b/source/blender/bmesh/tools/bmesh_path_region_uv.cc @@ -20,8 +20,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" -#include "bmesh.h" -#include "bmesh_path_region_uv.h" /* own include */ +#include "bmesh.hh" +#include "bmesh_path_region_uv.hh" /* own include */ /** * Special handling of vertices with 2 edges diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.h b/source/blender/bmesh/tools/bmesh_path_region_uv.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_path_region_uv.h rename to source/blender/bmesh/tools/bmesh_path_region_uv.hh index 42d6ba5ec8e..745ac13d36e 100644 --- a/source/blender/bmesh/tools/bmesh_path_region_uv.h +++ b/source/blender/bmesh/tools/bmesh_path_region_uv.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct LinkNode *BM_mesh_calc_path_uv_region_vert(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, @@ -35,7 +31,3 @@ struct LinkNode *BM_mesh_calc_path_uv_region_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_path_uv.cc b/source/blender/bmesh/tools/bmesh_path_uv.cc index bf4d31cbb8e..9b0c6261135 100644 --- a/source/blender/bmesh/tools/bmesh_path_uv.cc +++ b/source/blender/bmesh/tools/bmesh_path_uv.cc @@ -17,10 +17,10 @@ #include "DNA_meshdata_types.h" -#include "bmesh.h" -#include "bmesh_path_uv.h" /* own include */ -#include "intern/bmesh_query.h" -#include "intern/bmesh_query_uv.h" +#include "bmesh.hh" +#include "bmesh_path_uv.hh" /* own include */ +#include "intern/bmesh_query.hh" +#include "intern/bmesh_query_uv.hh" #define COST_INIT_MAX FLT_MAX diff --git a/source/blender/bmesh/tools/bmesh_path_uv.h b/source/blender/bmesh/tools/bmesh_path_uv.hh similarity index 95% rename from source/blender/bmesh/tools/bmesh_path_uv.h rename to source/blender/bmesh/tools/bmesh_path_uv.hh index 737c4b22d02..49e83d69e90 100644 --- a/source/blender/bmesh/tools/bmesh_path_uv.h +++ b/source/blender/bmesh/tools/bmesh_path_uv.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - struct BMCalcPathUVParams { uint use_topology_distance : 1; uint use_step_face : 1; @@ -42,7 +38,3 @@ struct LinkNode *BM_mesh_calc_path_uv_face(BMesh *bm, bool (*filter_fn)(BMFace *, void *), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_region_match.cc b/source/blender/bmesh/tools/bmesh_region_match.cc index dc71fc2f47e..d3387226b28 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.cc +++ b/source/blender/bmesh/tools/bmesh_region_match.cc @@ -29,9 +29,9 @@ #include "BLI_mempool.h" #include "MEM_guardedalloc.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "tools/bmesh_region_match.h" /* own include */ +#include "tools/bmesh_region_match.hh" /* own include */ /* avoid re-creating ghash and pools for each search */ #define USE_WALKER_REUSE diff --git a/source/blender/bmesh/tools/bmesh_region_match.h b/source/blender/bmesh/tools/bmesh_region_match.hh similarity index 88% rename from source/blender/bmesh/tools/bmesh_region_match.h rename to source/blender/bmesh/tools/bmesh_region_match.hh index 5d463c0755d..337c8d66da8 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.h +++ b/source/blender/bmesh/tools/bmesh_region_match.hh @@ -8,10 +8,6 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Take a face-region and return a list of matching face-regions. * @@ -22,7 +18,3 @@ int BM_mesh_region_match(BMesh *bm, BMFace **faces_region, uint faces_region_len, ListBase *r_face_regions); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_separate.cc b/source/blender/bmesh/tools/bmesh_separate.cc index 907a4471301..ee7564e2541 100644 --- a/source/blender/bmesh/tools/bmesh_separate.cc +++ b/source/blender/bmesh/tools/bmesh_separate.cc @@ -16,9 +16,9 @@ #include "BLI_buffer.h" #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_separate.h" /* own include */ -#include "intern/bmesh_private.h" +#include "bmesh.hh" +#include "bmesh_separate.hh" /* own include */ +#include "intern/bmesh_private.hh" void BM_mesh_separate_faces(BMesh *bm, BMFaceFilterFunc filter_fn, void *user_data) { diff --git a/source/blender/bmesh/tools/bmesh_separate.h b/source/blender/bmesh/tools/bmesh_separate.hh similarity index 80% rename from source/blender/bmesh/tools/bmesh_separate.h rename to source/blender/bmesh/tools/bmesh_separate.hh index f10d1012236..0c90c78cc37 100644 --- a/source/blender/bmesh/tools/bmesh_separate.h +++ b/source/blender/bmesh/tools/bmesh_separate.hh @@ -8,16 +8,8 @@ * \ingroup bmesh */ -#ifdef __cplusplus -extern "C" { -#endif - /** * Split all faces that match `filter_fn`. * \note */ void BM_mesh_separate_faces(BMesh *bm, BMFaceFilterFunc filter_fn, void *user_data); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_triangulate.cc b/source/blender/bmesh/tools/bmesh_triangulate.cc index 4c5963d5692..072038877d6 100644 --- a/source/blender/bmesh/tools/bmesh_triangulate.cc +++ b/source/blender/bmesh/tools/bmesh_triangulate.cc @@ -22,9 +22,9 @@ #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" -#include "bmesh.h" +#include "bmesh.hh" -#include "bmesh_triangulate.h" /* own include */ +#include "bmesh_triangulate.hh" /* own include */ /** * a version of #BM_face_triangulate that maps to #BMOpSlot diff --git a/source/blender/bmesh/tools/bmesh_triangulate.h b/source/blender/bmesh/tools/bmesh_triangulate.hh similarity index 88% rename from source/blender/bmesh/tools/bmesh_triangulate.h rename to source/blender/bmesh/tools/bmesh_triangulate.hh index 826721ea45f..57d9e4accc2 100644 --- a/source/blender/bmesh/tools/bmesh_triangulate.h +++ b/source/blender/bmesh/tools/bmesh_triangulate.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - void BM_mesh_triangulate(BMesh *bm, int quad_method, int ngon_method, @@ -22,7 +18,3 @@ void BM_mesh_triangulate(BMesh *bm, BMOperator *op, BMOpSlot *slot_facemap_out, BMOpSlot *slot_facemap_double_out); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/bmesh/tools/bmesh_wireframe.cc b/source/blender/bmesh/tools/bmesh_wireframe.cc index 1ea8f6f1506..8fe4995e26e 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.cc +++ b/source/blender/bmesh/tools/bmesh_wireframe.cc @@ -12,7 +12,7 @@ #include "DNA_meshdata_types.h" -#include "bmesh.h" +#include "bmesh.hh" #include "BLI_math_geom.h" #include "BLI_math_vector.h" @@ -20,7 +20,7 @@ #include "BKE_customdata.hh" #include "BKE_deform.h" -#include "bmesh_wireframe.h" +#include "bmesh_wireframe.hh" static BMLoop *bm_edge_tag_faceloop(BMEdge *e) { diff --git a/source/blender/bmesh/tools/bmesh_wireframe.h b/source/blender/bmesh/tools/bmesh_wireframe.hh similarity index 93% rename from source/blender/bmesh/tools/bmesh_wireframe.h rename to source/blender/bmesh/tools/bmesh_wireframe.hh index a0119087bbe..5017410230f 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.h +++ b/source/blender/bmesh/tools/bmesh_wireframe.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /** * \param defgrp_index: Vertex group index, -1 for no vertex groups. * @@ -35,7 +31,3 @@ void BM_mesh_wireframe(BMesh *bm, short mat_offset, short mat_max, bool use_tag); - -#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 05392b673cc..d97c12bc112 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -47,7 +47,7 @@ #include "atomic_ops.h" -#include "bmesh.h" +#include "bmesh.hh" #include "GPU_batch.h" #include "GPU_material.h" diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index f9b033f898d..83bf42dfce0 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -43,7 +43,7 @@ #include "WM_api.hh" #include "draw_manager_text.h" -#include "intern/bmesh_polygon.h" +#include "intern/bmesh_polygon.hh" struct ViewCachedString { float vec[3]; diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 6617fba73c6..3d4dd34452a 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -51,7 +51,7 @@ #include "DRW_pbvh.hh" #include "attribute_convert.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "draw_pbvh.hh" #include "gpu_private.h" diff --git a/source/blender/editors/mesh/editmesh_attribute.cc b/source/blender/editors/mesh/editmesh_attribute.cc index 08c7cce8f25..69fdc495f4d 100644 --- a/source/blender/editors/mesh/editmesh_attribute.cc +++ b/source/blender/editors/mesh/editmesh_attribute.cc @@ -39,7 +39,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "bmesh_tools.h" +#include "bmesh_tools.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/mesh/editmesh_automerge.cc b/source/blender/editors/mesh/editmesh_automerge.cc index c2716ee2005..630634d8f2d 100644 --- a/source/blender/editors/mesh/editmesh_automerge.cc +++ b/source/blender/editors/mesh/editmesh_automerge.cc @@ -17,7 +17,7 @@ #include "ED_mesh.hh" -#include "tools/bmesh_intersect_edges.h" +#include "tools/bmesh_intersect_edges.hh" //#define DEBUG_TIME #ifdef DEBUG_TIME diff --git a/source/blender/editors/mesh/editmesh_intersect.cc b/source/blender/editors/mesh/editmesh_intersect.cc index 44d8edf12b4..01822e70474 100644 --- a/source/blender/editors/mesh/editmesh_intersect.cc +++ b/source/blender/editors/mesh/editmesh_intersect.cc @@ -34,13 +34,13 @@ #include "ED_mesh.hh" #include "ED_screen.hh" -#include "intern/bmesh_private.h" +#include "intern/bmesh_private.hh" #include "mesh_intern.h" /* own include */ -#include "tools/bmesh_boolean.h" -#include "tools/bmesh_intersect.h" -#include "tools/bmesh_separate.h" +#include "tools/bmesh_boolean.hh" +#include "tools/bmesh_intersect.hh" +#include "tools/bmesh_separate.hh" /* detect isolated holes and fill them */ #define USE_NET_ISLAND_CONNECT diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index 355898443b4..878e8af6660 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -42,7 +42,7 @@ #include "ED_undo.hh" #include "ED_view3d.hh" -#include "bmesh_tools.h" +#include "bmesh_tools.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_path.cc b/source/blender/editors/mesh/editmesh_path.cc index 49b9348c103..ed96e009565 100644 --- a/source/blender/editors/mesh/editmesh_path.cc +++ b/source/blender/editors/mesh/editmesh_path.cc @@ -40,8 +40,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/mesh/editmesh_polybuild.cc b/source/blender/editors/mesh/editmesh_polybuild.cc index 24ada9f4909..88f090a83ca 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.cc +++ b/source/blender/editors/mesh/editmesh_polybuild.cc @@ -32,7 +32,7 @@ #include "ED_transform.hh" #include "ED_view3d.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_rip.cc b/source/blender/editors/mesh/editmesh_rip.cc index 12ea1c04774..18f220bfff3 100644 --- a/source/blender/editors/mesh/editmesh_rip.cc +++ b/source/blender/editors/mesh/editmesh_rip.cc @@ -32,8 +32,8 @@ #include "ED_transform.hh" #include "ED_view3d.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_rip_edge.cc b/source/blender/editors/mesh/editmesh_rip_edge.cc index 120b5a7dcf6..c9682eb127a 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.cc +++ b/source/blender/editors/mesh/editmesh_rip_edge.cc @@ -27,7 +27,7 @@ #include "ED_transform.hh" #include "ED_view3d.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index b9dac732b9d..2c27a24d132 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -55,7 +55,7 @@ #include "UI_resources.hh" -#include "bmesh_tools.h" +#include "bmesh_tools.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index 48d3942c773..6797d01d48b 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -76,7 +76,7 @@ #include "mesh_intern.h" /* own include */ -#include "bmesh_tools.h" +#include "bmesh_tools.hh" #define USE_FACE_CREATE_SEL_EXTEND diff --git a/source/blender/editors/object/object_data_transform.cc b/source/blender/editors/object/object_data_transform.cc index 89f2dec3c67..25fe591ffe8 100644 --- a/source/blender/editors/object/object_data_transform.cc +++ b/source/blender/editors/object/object_data_transform.cc @@ -41,7 +41,7 @@ #include "BKE_mesh.hh" #include "BKE_scene.h" -#include "bmesh.h" +#include "bmesh.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index 7f5ce3df9cf..8efc8b4c87c 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -44,7 +44,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index f292ad68fbb..93980d3685f 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -106,7 +106,7 @@ #include "IMB_colormanagement.h" -//#include "bmesh_tools.h" +//#include "bmesh_tools.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_mask.cc b/source/blender/editors/sculpt_paint/paint_mask.cc index aa54b99d557..9fa6868ab5d 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_mask.cc @@ -54,8 +54,8 @@ #include "ED_sculpt.hh" #include "ED_view3d.hh" -#include "bmesh.h" -#include "tools/bmesh_boolean.h" +#include "bmesh.hh" +#include "tools/bmesh_boolean.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 595424e6506..21472962cdc 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -67,7 +67,7 @@ #include "IMB_imbuf.h" #include "BKE_ccg.h" -#include "bmesh.h" +#include "bmesh.hh" #include "paint_intern.hh" /* own include */ #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index 9a6aa6b894c..e33c11e0526 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/source/blender/editors/sculpt_paint/paint_weight.cc @@ -63,7 +63,7 @@ #include "IMB_imbuf.h" #include "BKE_ccg.h" -#include "bmesh.h" +#include "bmesh.hh" #include "paint_intern.hh" /* own include */ #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index 8131e6af53f..07e56722dce 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -80,7 +80,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" using blender::float3; using blender::MutableSpan; diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc index 18002b05295..0f92267bac9 100644 --- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc +++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc @@ -48,7 +48,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc index 94158485f98..74d9c816c0b 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc @@ -38,7 +38,7 @@ #include "paint_intern.hh" #include "sculpt_intern.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc index 9349cdc85ad..b0dbf3e811d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc @@ -49,7 +49,7 @@ #include "UI_interface.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index bf8413f6697..a95bff21fbd 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -42,8 +42,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" using blender::IndexRange; diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index 92ee367457c..55406cfe87f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -51,7 +51,7 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf.h" -#include "bmesh.h" +#include "bmesh.hh" using blender::Span; using blender::Vector; diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index ad8c5d99c69..38d86a32445 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -56,7 +56,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" using blender::Array; using blender::float3; diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc index 3be7d1b1a4f..6bf12a354e7 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc @@ -28,7 +28,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index 81ad9022a39..6878d0e83b6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -47,7 +47,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc index 86b3b015ceb..1d878dfcd0e 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc @@ -32,7 +32,7 @@ #include "paint_intern.hh" #include "sculpt_intern.hh" -#include "bmesh.h" +#include "bmesh.hh" #define SCULPT_GEODESIC_VERTEX_NONE -1 diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc index e5c02a1af99..de457663ec3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc +++ b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc @@ -34,7 +34,7 @@ #include "sculpt_intern.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc index affe1bf5673..a2f421ece7f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc @@ -26,7 +26,7 @@ #include "GPU_immediate.h" #include "GPU_matrix.h" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index 203c16153e4..866e96c495c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -67,7 +67,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc index a543d0cc677..4f46ada0bd5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc @@ -28,7 +28,7 @@ #include "IMB_imbuf.h" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index e0fd0b1da80..04fd11e5fc1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -25,7 +25,7 @@ #include "BKE_pbvh_api.hh" #include "BKE_pbvh_pixels.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.cc b/source/blender/editors/sculpt_paint/sculpt_pose.cc index a2e4a88de15..72d91eeb1e8 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.cc +++ b/source/blender/editors/sculpt_paint/sculpt_pose.cc @@ -27,7 +27,7 @@ #include "paint_intern.hh" #include "sculpt_intern.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.cc b/source/blender/editors/sculpt_paint/sculpt_smooth.cc index e574aae9a62..42896de7684 100644 --- a/source/blender/editors/sculpt_paint/sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_smooth.cc @@ -20,7 +20,7 @@ #include "sculpt_intern.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index 582dbe07bb6..fced7afd063 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -36,7 +36,7 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "bmesh.h" +#include "bmesh.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 8b3c30d6ff7..a721f393fbd 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -77,7 +77,7 @@ #include "ED_sculpt.hh" #include "ED_undo.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "sculpt_intern.hh" using blender::Span; 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 3674117f76f..3446d4da9da 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -44,7 +44,7 @@ #include "RNA_access.hh" #include "RNA_enum_types.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "spreadsheet_data_source_geometry.hh" #include "spreadsheet_intern.hh" 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 1a016f43b37..06f124537c6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -36,7 +36,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "ED_gizmo_library.hh" #include "ED_mesh.hh" diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc index 14fa169b015..da63c8c74df 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.cc +++ b/source/blender/editors/space_view3d/view3d_iterators.cc @@ -38,7 +38,7 @@ #include "ANIM_bone_collections.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "ED_armature.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 5996b80a36c..9a7bbdee7da 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -52,10 +52,10 @@ #include "UI_view2d.hh" -#include "intern/bmesh_marking.h" +#include "intern/bmesh_marking.hh" #include "uvedit_intern.h" -#include "bmesh_tools.h" +#include "bmesh_tools.hh" /* -------------------------------------------------------------------- */ /** \name Path Select Struct & Properties diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index 25f032ec0b2..b6d1feb9f87 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc @@ -29,7 +29,7 @@ #include "DRW_engine.h" -#include "bmesh.h" +#include "bmesh.hh" #include "UI_resources.hh" diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index 8f223dad0e0..07c41e0852d 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -23,8 +23,8 @@ #include "BKE_modifier.hh" #include "BKE_object.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 24384c44902..234a2a195d5 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -58,8 +58,8 @@ #include "WM_api.hh" /* XXX hrm, see if we can do without this */ #include "WM_types.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/io/ply/exporter/ply_export_load_plydata.cc b/source/blender/io/ply/exporter/ply_export_load_plydata.cc index 5495b958340..35a9cc68996 100644 --- a/source/blender/io/ply/exporter/ply_export_load_plydata.cc +++ b/source/blender/io/ply/exporter/ply_export_load_plydata.cc @@ -24,9 +24,9 @@ #include "DEG_depsgraph_query.hh" #include "DNA_layer_types.h" -#include "bmesh.h" -#include "bmesh_tools.h" -#include +#include "bmesh.hh" +#include "bmesh_tools.hh" +#include namespace blender::io::ply { 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 bbbf92650a5..7fc9d55c354 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -31,8 +31,8 @@ #include "obj_export_mesh.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" namespace blender::io::obj { OBJMesh::OBJMesh(Depsgraph *depsgraph, const OBJExportParams &export_params, Object *mesh_object) diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc index 79c3cf47c56..872b9aeb94d 100644 --- a/source/blender/modifiers/intern/MOD_bevel.cc +++ b/source/blender/modifiers/intern/MOD_bevel.cc @@ -41,8 +41,8 @@ #include "GEO_randomize.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index b2c8ba9d3cc..24bfe729960 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -53,10 +53,10 @@ #include "GEO_randomize.hh" -#include "bmesh.h" -#include "bmesh_tools.h" -#include "tools/bmesh_boolean.h" -#include "tools/bmesh_intersect.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" +#include "tools/bmesh_boolean.hh" +#include "tools/bmesh_intersect.hh" // #define DEBUG_TIME diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index 927fa90a4b3..7641a99f896 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -34,8 +34,8 @@ #include "GEO_randomize.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" // #define USE_TIMEIT diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc index 0aa36cf9eef..dd373d41bec 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.cc +++ b/source/blender/modifiers/intern/MOD_edgesplit.cc @@ -32,8 +32,8 @@ #include "RNA_access.hh" #include "RNA_prototypes.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "MOD_modifiertypes.hh" #include "MOD_ui_common.hh" diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc index 4852dccbcda..57a2af44902 100644 --- a/source/blender/modifiers/intern/MOD_skin.cc +++ b/source/blender/modifiers/intern/MOD_skin.cc @@ -78,7 +78,7 @@ #include "MOD_modifiertypes.hh" #include "MOD_ui_common.hh" -#include "bmesh.h" +#include "bmesh.hh" /* -------------------------------------------------------------------- */ /** \name Generic BMesh Utilities diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc index 44b55e2d5b5..32cf7c6f975 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.cc +++ b/source/blender/modifiers/intern/MOD_triangulate.cc @@ -31,8 +31,8 @@ #include "RNA_access.hh" #include "RNA_prototypes.h" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "MOD_modifiertypes.hh" #include "MOD_ui_common.hh" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc index 97b26463b13..770892c4a93 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.cc +++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc @@ -40,7 +40,7 @@ #include "MOD_ui_common.hh" #include "MOD_util.hh" -#include "bmesh.h" +#include "bmesh.hh" #define CLNORS_VALID_VEC_LEN (1e-6f) diff --git a/source/blender/modifiers/intern/MOD_wireframe.cc b/source/blender/modifiers/intern/MOD_wireframe.cc index 98d8f761756..6d34cc5dcf8 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.cc +++ b/source/blender/modifiers/intern/MOD_wireframe.cc @@ -31,8 +31,8 @@ #include "MOD_modifiertypes.hh" #include "MOD_ui_common.hh" -#include "bmesh.h" -#include "tools/bmesh_wireframe.h" +#include "bmesh.hh" +#include "tools/bmesh_wireframe.hh" static void init_data(ModifierData *md) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc index 15f154955fa..c7de5af0db3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc @@ -10,7 +10,7 @@ #include "GEO_randomize.hh" -#include "bmesh.h" +#include "bmesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc index 61dcbc5ca12..6d4c1689a58 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc @@ -5,8 +5,8 @@ #include "BKE_customdata.hh" #include "BKE_mesh.hh" -#include "bmesh.h" -#include "bmesh_tools.h" +#include "bmesh.hh" +#include "bmesh_tools.hh" #include "DNA_mesh_types.h" diff --git a/source/blender/python/bmesh/bmesh_py_api.cc b/source/blender/python/bmesh/bmesh_py_api.cc index 7bdae1c706c..6f4249a7fd6 100644 --- a/source/blender/python/bmesh/bmesh_py_api.cc +++ b/source/blender/python/bmesh/bmesh_py_api.cc @@ -12,7 +12,7 @@ #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_types.h" #include "bmesh_py_types_customdata.h" diff --git a/source/blender/python/bmesh/bmesh_py_geometry.cc b/source/blender/python/bmesh/bmesh_py_geometry.cc index 087c2660f1c..3691d64add2 100644 --- a/source/blender/python/bmesh/bmesh_py_geometry.cc +++ b/source/blender/python/bmesh/bmesh_py_geometry.cc @@ -15,7 +15,7 @@ #include "../mathutils/mathutils.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_geometry.h" /* own include */ #include "bmesh_py_types.h" diff --git a/source/blender/python/bmesh/bmesh_py_ops.cc b/source/blender/python/bmesh/bmesh_py_ops.cc index 295c48aeb09..7370e9be880 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.cc +++ b/source/blender/python/bmesh/bmesh_py_ops.cc @@ -16,7 +16,7 @@ #include "MEM_guardedalloc.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_ops.h" /* own include */ #include "bmesh_py_ops_call.h" diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.cc b/source/blender/python/bmesh/bmesh_py_ops_call.cc index 925b4b8f76d..ff5c2d7785f 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.cc +++ b/source/blender/python/bmesh/bmesh_py_ops_call.cc @@ -16,7 +16,7 @@ #include "../mathutils/mathutils.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_ops_call.h" /* own include */ diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index a4aee1c5506..851c5b39705 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -27,7 +27,7 @@ #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" -#include "bmesh.h" +#include "bmesh.hh" #include diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.cc b/source/blender/python/bmesh/bmesh_py_types_customdata.cc index ae2d71c8a2f..7cd7b031c02 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.cc +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.cc @@ -14,7 +14,7 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_types.h" #include "bmesh_py_types_customdata.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc index 3d443f227aa..87377d8a373 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc @@ -33,7 +33,7 @@ #include "BKE_deform.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_types_meshdata.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_select.cc b/source/blender/python/bmesh/bmesh_py_types_select.cc index ec413396245..fb21a9155ea 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.cc +++ b/source/blender/python/bmesh/bmesh_py_types_select.cc @@ -17,7 +17,7 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_types.h" #include "bmesh_py_types_select.h" diff --git a/source/blender/python/bmesh/bmesh_py_utils.cc b/source/blender/python/bmesh/bmesh_py_utils.cc index b216c044c32..2a431dde080 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.cc +++ b/source/blender/python/bmesh/bmesh_py_utils.cc @@ -18,7 +18,7 @@ #include "../mathutils/mathutils.h" -#include "bmesh.h" +#include "bmesh.hh" #include "bmesh_py_types.h" #include "bmesh_py_utils.h" /* own include */ diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc index daf2a4efd28..1eadb4dd8be 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.cc +++ b/source/blender/python/mathutils/mathutils_bvhtree.cc @@ -44,7 +44,7 @@ # include "DEG_depsgraph_query.hh" -# include "bmesh.h" +# include "bmesh.hh" # include "../bmesh/bmesh_py_types.h" #endif /* MATH_STANDALONE */