diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 01:55:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 02:00:39 +0300 |
commit | add923f98a75f11200056c83d7f766304bb6b29b (patch) | |
tree | 1dff069a9ea796cd48615ce7b6dbaf0ccd4113be /source/blender/editors/space_buttons | |
parent | 6fa7fa6671c9e7cf9baad54b0f0861755b43f2b1 (diff) |
UI: add active tool panel to tool settings
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 12 |
1 files changed, 9 insertions, 3 deletions
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 |