From f35ef57c8c4f218548926b49dbc950b056d8de4e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 28 Jun 2019 18:47:47 +1000 Subject: Revert "Fix invalid area tool being set from message passing" This reverts commit 9ec8887599b1c14dac47cca1a073fa50b333d5ee. Causes assert when selection changes modes. --- source/blender/editors/space_view3d/space_view3d.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/space_view3d.c') diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index a90e59745be..c1891865d6d 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -980,7 +980,7 @@ static void view3d_main_region_message_subscribe(const struct bContext *C, struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene), struct bScreen *UNUSED(screen), - struct ScrArea *UNUSED(sa), + struct ScrArea *sa, struct ARegion *ar, struct wmMsgBus *mbus) { @@ -1054,6 +1054,16 @@ static void view3d_main_region_message_subscribe(const struct bContext *C, break; } } + + { + wmMsgSubscribeValue msg_sub_value_region_tag_refresh = { + .owner = ar, + .user_data = sa, + .notify = WM_toolsystem_do_msg_notify_tag_refresh, + }; + WM_msg_subscribe_rna_anon_prop(mbus, Object, mode, &msg_sub_value_region_tag_refresh); + WM_msg_subscribe_rna_anon_prop(mbus, LayerObjects, active, &msg_sub_value_region_tag_refresh); + } } /* concept is to retrieve cursor type context-less */ -- cgit v1.2.3