diff options
| author | Julian Eisel <julian@blender.org> | 2022-03-14 18:39:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-03-14 18:50:49 +0300 |
| commit | 9b298cf3dbec9e246748448cc635a5055fe90c19 (patch) | |
| tree | c9fb6ddaf16bec463d9d4dd5a65a8c9d285afc8f /source/blender/editors/space_nla | |
| parent | cff6eb65804da3a06bde3c9152bec26e01a24992 (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_nla')
| -rw-r--r-- | source/blender/editors/space_nla/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/space_nla.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 3447bbad396..85a2c3fd0a1 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -12,6 +12,8 @@ set(INC ../../windowmanager ../../../../intern/glew-mx ../../../../intern/guardedalloc + # RNA_prototypes.h + ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -34,3 +36,6 @@ set(LIB blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") + +# RNA_prototypes.h +add_dependencies(bf_editor_space_nla bf_rna) diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index 3a881363906..3e7784d0364 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -424,12 +424,6 @@ static void nla_main_region_message_subscribe(const wmRegionMessageSubscribePara /* 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, |