From add923f98a75f11200056c83d7f766304bb6b29b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Aug 2018 08:55:34 +1000 Subject: UI: add active tool panel to tool settings --- source/blender/editors/space_buttons/space_buttons.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_buttons/space_buttons.c') diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 0350e3fcd14..fe10eee0536 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -200,11 +200,13 @@ static void buttons_main_region_layout_properties(const bContext *C, SpaceButs * static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) { - const char *contexts[3] = {NULL}; - const WorkSpace *workspace = CTX_wm_workspace(C); const int mode = CTX_data_mode_enum(C); + const char *contexts_base[4] = {NULL}; + contexts_base[0] = ".active_tool"; + const char **contexts = &contexts_base[1]; + if (workspace->tools_space_type == SPACE_VIEW3D) { switch (mode) { case CTX_MODE_EDIT_MESH: @@ -283,7 +285,7 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) } const bool vertical = true; - ED_region_panels_layout_ex(C, ar, contexts, -1, vertical); + ED_region_panels_layout_ex(C, ar, contexts_base, -1, vertical); } static void buttons_main_region_layout(const bContext *C, ARegion *ar) @@ -365,6 +367,10 @@ static void buttons_header_region_message_subscribe( if (!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_WORLD)) { WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw); } + + if (sbuts->mainb == BCONTEXT_TOOL) { + WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_region_tag_redraw); + } } /* draw a certain button set only if properties area is currently -- cgit v1.2.3