diff options
| author | Julian Eisel <julian@blender.org> | 2022-03-14 18:39:42 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-11 01:30:40 +0300 |
| commit | d0a8f300c13dd01658f79ddf201bd5344320c60f (patch) | |
| tree | ef3c1f602a0e6810dbdbe048f01bf077a9d801af /source/blender/editors/space_graph | |
| parent | d67bca9ee4dd177357d1e2eb02de62e1d69f7c24 (diff) | |
RNA: Generate property declerations header, solving msg-bus C++ incompatibility
Lets `makesrna` generate a `RNA_prototypes.h` header with declarations for all
RNA properties. This can be included in regular source files when needing to
reference RNA properties statically.
This solves an issue on MSVC with adding such declarations in functions, like
we used to do. See 800fc1736748. Removes any such declarations and the related
FIXME comments.
Reviewed By: campbellbarton, LazyDodo, brecht
Differential Revision: https://developer.blender.org/D13837
Diffstat (limited to 'source/blender/editors/space_graph')
| -rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index a087b873674..ebcbf59be5f 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -12,6 +12,8 @@ set(INC ../../windowmanager ../../../../intern/glew-mx ../../../../intern/guardedalloc + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(SRC @@ -48,3 +50,6 @@ endif() blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") + +# RNA_prototypes.h +add_dependencies(bf_editor_space_graph bf_rna) diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index f041f2d1d3b..43621d74e79 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -477,12 +477,6 @@ static void graph_region_message_subscribe(const wmRegionMessageSubscribeParams /* Timeline depends on scene properties. */ { bool use_preview = (scene->r.flag & SCER_PRV_RANGE); - extern PropertyRNA rna_Scene_frame_start; - extern PropertyRNA rna_Scene_frame_end; - extern PropertyRNA rna_Scene_frame_preview_start; - extern PropertyRNA rna_Scene_frame_preview_end; - extern PropertyRNA rna_Scene_use_preview_range; - extern PropertyRNA rna_Scene_frame_current; const PropertyRNA *props[] = { use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start, use_preview ? &rna_Scene_frame_preview_end : &rna_Scene_frame_end, |