diff options
author | Julian Eisel <julian@blender.org> | 2022-03-14 18:54:46 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-03-14 19:08:46 +0300 |
commit | a5578351c38e2b2bb45d940a2fc57354e5fe3a5e (patch) | |
tree | 3d6b5d275f27f6b549772586c2e3af59ea728a1d /source/blender/nodes | |
parent | cc98b40f870c39a997cf99412b308b8a0e82ed44 (diff) |
Auto-generate RNA-structs declarations in `RNA_prototypes.h`
So far it was needed to declare a new RNA struct to `RNA_access.h` manually.
Since 9b298cf3dbec we generate a `RNA_prototypes.h` for RNA property
declarations. Now this also includes the RNA struct declarations, so they don't
have to be added manually anymore.
Differential Revision: https://developer.blender.org/D13862
Reviewed by: brecht, campbellbarton
Diffstat (limited to 'source/blender/nodes')
15 files changed, 34 insertions, 0 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 2ac55b860c3..386e5fe14c9 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -34,6 +34,8 @@ set(INC # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -163,3 +165,5 @@ blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # Needed so we can use dna_type_offsets.h for defaults initialization. add_dependencies(bf_nodes bf_dna) +# RNA_prototypes.h +add_dependencies(bf_nodes bf_rna) diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 006682631ae..b8bdd9859e0 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -19,6 +19,8 @@ set(INC # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -141,3 +143,5 @@ endif() # Needed so we can use dna_type_offsets.h for defaults initialization. add_dependencies(bf_nodes_composite bf_dna) +# RNA_prototypes.h +add_dependencies(bf_nodes_composite bf_rna) diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc index f12c6633f45..7522ad1efe6 100644 --- a/source/blender/nodes/composite/node_composite_tree.cc +++ b/source/blender/nodes/composite/node_composite_tree.cc @@ -26,6 +26,7 @@ #include "node_util.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "NOD_composite.h" #include "node_composite_util.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc index 44694623343..c3ed5cd7aa8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc @@ -11,6 +11,7 @@ #include "BLI_math_color.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_output_file.cc b/source/blender/nodes/composite/nodes/node_composite_output_file.cc index 9602070dc2f..2e1276dda24 100644 --- a/source/blender/nodes/composite/nodes/node_composite_output_file.cc +++ b/source/blender/nodes/composite/nodes/node_composite_output_file.cc @@ -14,6 +14,7 @@ #include "BKE_context.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc index c69a9362488..fb0c03579a2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc @@ -6,6 +6,7 @@ */ #include "RNA_access.h" +#include "RNA_prototypes.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc index a6e4d63d058..17a086f306f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc +++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc @@ -6,6 +6,7 @@ */ #include "RNA_access.h" +#include "RNA_prototypes.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index d9e64c32eae..4d39240fed4 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -19,6 +19,8 @@ set(INC ../../render ../../windowmanager ../../../../intern/guardedalloc + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -270,3 +272,6 @@ if(WITH_UNITY_BUILD) set_target_properties(bf_nodes_geometry PROPERTIES UNITY_BUILD ON) set_target_properties(bf_nodes_geometry PROPERTIES UNITY_BUILD_BATCH_SIZE 10) endif() + +# RNA_prototypes.h +add_dependencies(bf_nodes_geometry bf_rna) diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index 5fd6268080b..e081e007c81 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -17,6 +17,7 @@ #include "DNA_space_types.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "UI_resources.h" diff --git a/source/blender/nodes/intern/node_tree_ref.cc b/source/blender/nodes/intern/node_tree_ref.cc index 8659b839190..01a31ab852d 100644 --- a/source/blender/nodes/intern/node_tree_ref.cc +++ b/source/blender/nodes/intern/node_tree_ref.cc @@ -7,6 +7,8 @@ #include "BLI_dot_export.hh" #include "BLI_stack.hh" +#include "RNA_prototypes.h" + namespace blender::nodes { NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index 10ff27652c3..5d2e1663ae3 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -23,6 +23,7 @@ #include "RNA_access.h" #include "RNA_enum_types.h" +#include "RNA_prototypes.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index a9e21e07a31..9a3663b51c2 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -19,6 +19,8 @@ set(INC ../../windowmanager ../../../../intern/guardedalloc ../../../../intern/sky/include + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -151,3 +153,6 @@ if(WITH_UNITY_BUILD) set_target_properties(bf_nodes_shader PROPERTIES UNITY_BUILD ON) set_target_properties(bf_nodes_shader PROPERTIES UNITY_BUILD_BATCH_SIZE 10) endif() + +# RNA_prototypes.h +add_dependencies(bf_nodes_shader bf_rna) diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index 9d56de45ba3..03baebfd28b 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -32,6 +32,7 @@ #include "BKE_scene.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "GPU_material.h" diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index 35b83b386cf..7706f118507 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -15,6 +15,8 @@ set(INC ../../render ../../windowmanager ../../../../intern/guardedalloc + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -68,3 +70,6 @@ endif() blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") + +# RNA_prototypes.h +add_dependencies(bf_nodes_texture bf_rna) diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index c318d101863..903e293a962 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -31,6 +31,7 @@ #include "DEG_depsgraph.h" #include "RNA_access.h" +#include "RNA_prototypes.h" #include "RE_texture.h" |