From 500f09b88a65df847fa4d37720d245674e093767 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 24 Jan 2024 11:33:47 -0500 Subject: [PATCH] Cleanup: Move metaball BKE headers to C++ --- source/blender/blenkernel/{BKE_mball.h => BKE_mball.hh} | 8 -------- .../{BKE_mball_tessellate.h => BKE_mball_tessellate.hh} | 8 -------- source/blender/blenkernel/CMakeLists.txt | 4 ++-- source/blender/blenkernel/intern/displist.cc | 2 +- source/blender/blenkernel/intern/lib_remap.cc | 2 +- source/blender/blenkernel/intern/mball.cc | 4 ++-- source/blender/blenkernel/intern/mball_tessellate.cc | 2 +- source/blender/blenkernel/intern/mesh_convert.cc | 2 +- source/blender/blenkernel/intern/object.cc | 2 +- source/blender/blenkernel/intern/object_update.cc | 2 +- .../blenloader/tests/blendfile_loading_base_test.cc | 2 +- .../blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 +- .../depsgraph/intern/builder/deg_builder_relations.cc | 2 +- source/blender/draw/engines/overlay/overlay_extra.cc | 2 +- source/blender/draw/intern/draw_manager_c.cc | 2 +- source/blender/editors/metaball/mball_edit.cc | 2 +- source/blender/editors/object/object_add.cc | 2 +- source/blender/editors/object/object_data_transform.cc | 2 +- source/blender/editors/object/object_edit.cc | 2 +- source/blender/editors/object/object_modifier.cc | 2 +- source/blender/editors/object/object_relations.cc | 2 +- source/blender/editors/object/object_transform.cc | 2 +- source/blender/editors/space_view3d/space_view3d.cc | 2 +- source/blender/editors/space_view3d/view3d_select.cc | 2 +- source/blender/editors/space_view3d/view3d_snap.cc | 2 +- source/blender/io/alembic/exporter/abc_writer_mball.cc | 2 +- source/blender/io/usd/intern/usd_writer_metaball.cc | 2 +- source/blender/makesrna/intern/rna_main_api.cc | 2 +- source/blender/makesrna/intern/rna_meta.cc | 2 +- source/blender/makesrna/intern/rna_meta_api.cc | 2 +- source/blender/makesrna/intern/rna_object_api.cc | 2 +- source/blender/windowmanager/intern/wm_init_exit.cc | 2 +- 32 files changed, 32 insertions(+), 48 deletions(-) rename source/blender/blenkernel/{BKE_mball.h => BKE_mball.hh} (98%) rename source/blender/blenkernel/{BKE_mball_tessellate.h => BKE_mball_tessellate.hh} (85%) diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.hh similarity index 98% rename from source/blender/blenkernel/BKE_mball.h rename to source/blender/blenkernel/BKE_mball.hh index f901d30c5d2..14b65b2fc22 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.hh @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Base; struct Depsgraph; struct Main; @@ -97,7 +93,3 @@ bool BKE_mball_select_swap_multi_ex(struct Base **bases, int bases_len); /* **** Depsgraph evaluation **** */ void BKE_mball_data_update(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_mball_tessellate.h b/source/blender/blenkernel/BKE_mball_tessellate.hh similarity index 85% rename from source/blender/blenkernel/BKE_mball_tessellate.h rename to source/blender/blenkernel/BKE_mball_tessellate.hh index 299acd09f49..73d1692c2e0 100644 --- a/source/blender/blenkernel/BKE_mball_tessellate.h +++ b/source/blender/blenkernel/BKE_mball_tessellate.hh @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Object; struct Scene; @@ -21,7 +17,3 @@ struct Mesh *BKE_mball_polygonize(struct Depsgraph *depsgraph, struct Object *ob); void BKE_mball_cubeTable_free(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 9e87c08c920..2086d571d02 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -432,8 +432,8 @@ set(SRC BKE_main_namemap.hh BKE_mask.h BKE_material.h - BKE_mball.h - BKE_mball_tessellate.h + BKE_mball.hh + BKE_mball_tessellate.hh BKE_mesh.h BKE_mesh.hh BKE_mesh_boolean_convert.hh diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index 1c584d8739d..cd161a2dbd7 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -36,7 +36,7 @@ #include "BKE_geometry_set.hh" #include "BKE_key.h" #include "BKE_lib_id.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" diff --git a/source/blender/blenkernel/intern/lib_remap.cc b/source/blender/blenkernel/intern/lib_remap.cc index 31f9d62f04f..0fc9df39fc8 100644 --- a/source/blender/blenkernel/intern/lib_remap.cc +++ b/source/blender/blenkernel/intern/lib_remap.cc @@ -26,7 +26,7 @@ #include "BKE_lib_remap.hh" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_modifier.hh" #include "BKE_multires.hh" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 26ae115ff86..857a13fa88d 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -49,8 +49,8 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_material.h" -#include "BKE_mball.h" -#include "BKE_mball_tessellate.h" +#include "BKE_mball.hh" +#include "BKE_mball_tessellate.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc index 99b90ef0632..11e2c999c8f 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.cc +++ b/source/blender/blenkernel/intern/mball_tessellate.cc @@ -32,7 +32,7 @@ #include "BKE_displist.h" #include "BKE_global.h" #include "BKE_lib_id.hh" -#include "BKE_mball_tessellate.h" /* own include */ +#include "BKE_mball_tessellate.hh" /* own include */ #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 0357d4fd82d..169cd047065 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -38,7 +38,7 @@ #include "BKE_lib_query.hh" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" #include "BKE_mesh_wrapper.hh" diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index e5ab7d11668..8a3378aea35 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -108,7 +108,7 @@ #include "BKE_linestyle.h" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc index e4501144cf4..6f5caf18e33 100644 --- a/source/blender/blenkernel/intern/object_update.cc +++ b/source/blender/blenkernel/intern/object_update.cc @@ -41,7 +41,7 @@ #include "BKE_layer.hh" #include "BKE_light.h" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index bd7bf39d2ac..6132c74f997 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -14,7 +14,7 @@ #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_main.hh" -#include "BKE_mball_tessellate.h" +#include "BKE_mball_tessellate.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index fc573995fe8..2f8fa8780d8 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -77,7 +77,7 @@ #include "BKE_light.h" #include "BKE_mask.h" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_movieclip.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 40d77e68c4f..9777b081f69 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -71,7 +71,7 @@ #include "BKE_layer.hh" #include "BKE_lib_query.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc index 4f22d59f76f..02697587fb0 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.cc +++ b/source/blender/draw/engines/overlay/overlay_extra.cc @@ -19,7 +19,7 @@ #include "BKE_constraint.h" #include "BKE_curve.hh" #include "BKE_global.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_movieclip.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index d9a24a352e2..4fc72359b16 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -30,7 +30,7 @@ #include "BKE_grease_pencil.h" #include "BKE_lattice.hh" #include "BKE_main.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc index a346f444405..9ae4ae6ce02 100644 --- a/source/blender/editors/metaball/mball_edit.cc +++ b/source/blender/editors/metaball/mball_edit.cc @@ -29,7 +29,7 @@ #include "BKE_context.hh" #include "BKE_layer.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index c1f12fbc7da..4ea4de53bd5 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -76,7 +76,7 @@ #include "BKE_lightprobe.h" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" #include "BKE_nla.h" diff --git a/source/blender/editors/object/object_data_transform.cc b/source/blender/editors/object/object_data_transform.cc index 016ce6d1857..35524a15db4 100644 --- a/source/blender/editors/object/object_data_transform.cc +++ b/source/blender/editors/object/object_data_transform.cc @@ -37,7 +37,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_key.h" #include "BKE_lattice.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_scene.h" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index a778c1202e6..f7504aed073 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -55,7 +55,7 @@ #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index da106f286f2..26ad6d3791f 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -55,7 +55,7 @@ #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 74971ee6a55..e44b79d4c7c 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -69,7 +69,7 @@ #include "BKE_lightprobe.h" #include "BKE_main.hh" #include "BKE_material.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_node.h" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 77893346ca0..ec94cb4d1b0 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -45,7 +45,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_multires.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index bc28576ccae..cf2ce6dbe76 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -46,7 +46,7 @@ #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_scene.h" diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 71e9498d590..7ff43137407 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -56,7 +56,7 @@ #include "BKE_editmesh.hh" #include "BKE_grease_pencil.hh" #include "BKE_layer.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc index 59f03aff8e7..5a379da4f04 100644 --- a/source/blender/editors/space_view3d/view3d_snap.cc +++ b/source/blender/editors/space_view3d/view3d_snap.cc @@ -26,7 +26,7 @@ #include "BKE_editmesh.hh" #include "BKE_layer.hh" #include "BKE_main.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_object.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/io/alembic/exporter/abc_writer_mball.cc b/source/blender/io/alembic/exporter/abc_writer_mball.cc index bf0ec358ac0..9fdda2dd066 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mball.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mball.cc @@ -13,7 +13,7 @@ #include "BKE_displist.h" #include "BKE_lib_id.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/io/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc index 893f13c4c2d..bafd44ef131 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.cc +++ b/source/blender/io/usd/intern/usd_writer_metaball.cc @@ -12,7 +12,7 @@ #include "BKE_displist.h" #include "BKE_lib_id.hh" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index 9fa4628529a..c13a39e83fb 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -44,7 +44,7 @@ # include "BKE_linestyle.h" # include "BKE_mask.h" # include "BKE_material.h" -# include "BKE_mball.h" +# include "BKE_mball.hh" # include "BKE_mesh.hh" # include "BKE_movieclip.h" # include "BKE_node.h" diff --git a/source/blender/makesrna/intern/rna_meta.cc b/source/blender/makesrna/intern/rna_meta.cc index 4852fcb74f4..179471192b2 100644 --- a/source/blender/makesrna/intern/rna_meta.cc +++ b/source/blender/makesrna/intern/rna_meta.cc @@ -29,7 +29,7 @@ # include "DNA_scene_types.h" # include "BKE_main.hh" -# include "BKE_mball.h" +# include "BKE_mball.hh" # include "BKE_scene.h" # include "DEG_depsgraph.hh" diff --git a/source/blender/makesrna/intern/rna_meta_api.cc b/source/blender/makesrna/intern/rna_meta_api.cc index 90552f375db..ac1bce8b6de 100644 --- a/source/blender/makesrna/intern/rna_meta_api.cc +++ b/source/blender/makesrna/intern/rna_meta_api.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" -#include "BKE_mball.h" +#include "BKE_mball.hh" #include "rna_internal.h" /* own include */ diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index f393bc16693..23423387a63 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -59,7 +59,7 @@ static const EnumPropertyItem space_items[] = { # include "BKE_global.h" # include "BKE_layer.hh" # include "BKE_main.hh" -# include "BKE_mball.h" +# include "BKE_mball.hh" # include "BKE_mesh.hh" # include "BKE_mesh_runtime.hh" # include "BKE_modifier.hh" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index 8f8f3162fc7..8e1d140db16 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -43,7 +43,7 @@ #include "BKE_keyconfig.h" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_mball_tessellate.h" +#include "BKE_mball_tessellate.hh" #include "BKE_node.hh" #include "BKE_preview_image.hh" #include "BKE_report.h"