diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-04-25 03:14:15 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-04-25 03:14:15 +0300 |
| commit | 05dddb71b098027cb36657120b946ff178ae0549 (patch) | |
| tree | 5a86248e8b425081d39a3c99bee998cd0baa4eed /source/blender/windowmanager/message_bus | |
| parent | 3a6f481d5a73bd2f35877394f2c4362697572663 (diff) | |
Revert "Info Editor: move to c++"
This reverts commit 9cce18a5858cb93da626f5f0fd7e09cd66637e05.
rB9cce18a5858c broke the build in unforeseen ways, not easily fixable.
revert for now, so master will at least build again.
Diffstat (limited to 'source/blender/windowmanager/message_bus')
| -rw-r--r-- | source/blender/windowmanager/message_bus/wm_message_bus.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h index 8c8caaf104b..7ae356cf806 100644 --- a/source/blender/windowmanager/message_bus/wm_message_bus.h +++ b/source/blender/windowmanager/message_bus/wm_message_bus.h @@ -260,10 +260,16 @@ void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id); /* Anonymous variants (for convenience) */ #define WM_msg_subscribe_rna_anon_type(mbus, type_, value) \ { \ - wmMsgParams_RNA msg_params = {0}; \ - msg_params.ptr.type = &RNA_##type_; \ - msg_params.prop = NULL; \ - WM_msg_subscribe_rna_params(mbus, &msg_params, value, __func__); \ + WM_msg_subscribe_rna_params(mbus, \ + &(const wmMsgParams_RNA){ \ + .ptr = \ + (PointerRNA){ \ + .type = &RNA_##type_, \ + }, \ + .prop = NULL, \ + }, \ + value, \ + __func__); \ } \ ((void)0) #define WM_msg_subscribe_rna_anon_prop(mbus, type_, prop_, value) \ @@ -271,10 +277,16 @@ void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id); _WM_MESSAGE_EXTERN_BEGIN; \ extern PropertyRNA rna_##type_##_##prop_; \ _WM_MESSAGE_EXTERN_END; \ - wmMsgParams_RNA msg_params = {0}; \ - msg_params.ptr.type = &RNA_##type_; \ - msg_params.prop = &rna_##type_##_##prop_; \ - WM_msg_subscribe_rna_params(mbus, &msg_params, value, __func__); \ + WM_msg_subscribe_rna_params(mbus, \ + &(const wmMsgParams_RNA){ \ + .ptr = \ + (PointerRNA){ \ + .type = &RNA_##type_, \ + }, \ + .prop = &rna_##type_##_##prop_, \ + }, \ + value, \ + __func__); \ } \ ((void)0) |