From e570f13616ecc7990beb7a6e2dc151b0b5d3daed Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 23 Jun 2023 22:15:42 +0200 Subject: [PATCH] Cleanup: Move NOD_geometry.h to C++ Pull Request: https://projects.blender.org/blender/blender/pulls/109306 --- source/blender/blenkernel/intern/node.cc | 2 +- source/blender/blenkernel/intern/simulation.cc | 2 +- source/blender/editors/space_node/drawnode.cc | 2 +- source/blender/editors/space_node/node_edit.cc | 2 +- source/blender/editors/space_node/node_group.cc | 2 +- source/blender/makesrna/intern/rna_nodetree.cc | 4 ++-- source/blender/modifiers/intern/MOD_nodes.cc | 2 +- source/blender/nodes/CMakeLists.txt | 2 +- source/blender/nodes/{NOD_geometry.h => NOD_geometry.hh} | 8 -------- source/blender/nodes/geometry/node_geometry_tree.cc | 2 +- source/blender/nodes/geometry/node_geometry_util.hh | 2 +- source/blender/nodes/geometry/nodes/node_geo_common.cc | 2 +- .../nodes/geometry/nodes/node_geo_simulation_input.cc | 2 +- 13 files changed, 13 insertions(+), 21 deletions(-) rename source/blender/nodes/{NOD_geometry.h => NOD_geometry.hh} (98%) diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 2e2d1a32c64..e94fe33989f 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -78,7 +78,7 @@ #include "NOD_common.h" #include "NOD_composite.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_geometry_nodes_lazy_function.hh" #include "NOD_node_declaration.hh" #include "NOD_register.hh" diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index 8df01de2042..1ebc4f99f59 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -40,7 +40,7 @@ #include "BKE_simulation.h" #include "BKE_simulation_state.hh" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "BLI_map.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index 6086868b632..107c0491f66 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -61,7 +61,7 @@ #include "IMB_imbuf_types.h" #include "NOD_composite.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_node_declaration.hh" #include "NOD_shader.h" #include "NOD_texture.h" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 69161ab4570..44aaaa32ade 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -66,7 +66,7 @@ #include "IMB_imbuf_types.h" #include "NOD_composite.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_shader.h" #include "NOD_socket.h" #include "NOD_texture.h" diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index fd28cea9fa3..a9751205f6a 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -51,7 +51,7 @@ #include "NOD_common.h" #include "NOD_composite.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_shader.h" #include "NOD_socket.h" #include "NOD_texture.h" diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index dbc15411c2a..b2bc80cda52 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -54,7 +54,7 @@ #include "RE_texture.h" #include "NOD_composite.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_socket.h" #include "DEG_depsgraph.h" @@ -574,7 +574,7 @@ static EnumPropertyItem rna_node_geometry_mesh_circle_fill_type_items[] = { # include "NOD_common.h" # include "NOD_composite.h" -# include "NOD_geometry.h" +# include "NOD_geometry.hh" # include "NOD_shader.h" # include "NOD_socket.h" # include "NOD_texture.h" diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index dbee969bf8b..f39963e20e1 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -87,7 +87,7 @@ #include "ED_undo.h" #include "ED_viewer_path.hh" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_geometry_nodes_execute.hh" #include "NOD_geometry_nodes_lazy_function.hh" #include "NOD_node_declaration.hh" diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 1f7cb4fd8e3..1f0de93fb38 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -62,7 +62,7 @@ set(SRC NOD_common.h NOD_composite.h NOD_derived_node_tree.hh - NOD_geometry.h + NOD_geometry.hh NOD_geometry_exec.hh NOD_geometry_nodes_execute.hh NOD_geometry_nodes_lazy_function.hh diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.hh similarity index 98% rename from source/blender/nodes/NOD_geometry.h rename to source/blender/nodes/NOD_geometry.hh index 8654fa6d01f..40ad7f4ef25 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.hh @@ -6,10 +6,6 @@ #include "BKE_node.h" -#ifdef __cplusplus -extern "C" { -#endif - extern struct bNodeTreeType *ntreeType_Geometry; void register_node_type_geo_custom_group(bNodeType *ntype); @@ -81,7 +77,3 @@ void NOD_geometry_simulation_output_move_item(struct NodeGeometrySimulationOutpu int to_index); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index 80caec57ac6..fa0faa4af87 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -6,7 +6,7 @@ #include "MEM_guardedalloc.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "BKE_context.h" #include "BKE_layer.h" diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh index b9c509ab850..fc457caac72 100644 --- a/source/blender/nodes/geometry/node_geometry_util.hh +++ b/source/blender/nodes/geometry/node_geometry_util.hh @@ -17,7 +17,7 @@ #include "BKE_node.hh" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_geometry_exec.hh" #include "NOD_socket_declarations.hh" #include "NOD_socket_declarations_geometry.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_common.cc b/source/blender/nodes/geometry/nodes/node_geo_common.cc index 67349791f71..8fb4bc8d9bd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_common.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_common.cc @@ -4,7 +4,7 @@ #include "BKE_node.hh" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_node_declaration.hh" #include "NOD_common.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc index d39efddc874..0bf580e4f0b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc @@ -10,7 +10,7 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "NOD_geometry.h" +#include "NOD_geometry.hh" #include "NOD_socket.h" #include "node_geometry_util.hh"