diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 06:06:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 06:06:03 +0300 |
| commit | 8ace389fc4c5d0b5ea789f8a26d7c6ff84703916 (patch) | |
| tree | 683fbccf77a4247240fbe1421e6ce90c8cf2fdc4 /source/blender/editors/space_buttons/space_buttons.c | |
| parent | a4a9f4b3d1979798506141f7dfcd9f928fe07d1b (diff) | |
UI: move workspace panels to tool settings
While this isn't the most logical place, there are very few workspace
options and they don't need to be in such a prominent location.
Diffstat (limited to 'source/blender/editors/space_buttons/space_buttons.c')
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index fe10eee0536..5172d63911c 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -153,9 +153,6 @@ static void buttons_main_region_layout_properties(const bContext *C, SpaceButs * case BCONTEXT_WORLD: contexts[0] = "world"; break; - case BCONTEXT_WORKSPACE: - contexts[0] = "workspace"; - break; case BCONTEXT_OBJECT: contexts[0] = "object"; break; @@ -203,7 +200,7 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) const WorkSpace *workspace = CTX_wm_workspace(C); const int mode = CTX_data_mode_enum(C); - const char *contexts_base[4] = {NULL}; + const char *contexts_base[5] = {NULL}; contexts_base[0] = ".active_tool"; const char **contexts = &contexts_base[1]; @@ -284,6 +281,13 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) break; } + int i = 0; + while (contexts_base[i]) { + i++; + } + BLI_assert(i < ARRAY_SIZE(contexts_base)); + contexts_base[i] = ".workspace"; + const bool vertical = true; ED_region_panels_layout_ex(C, ar, contexts_base, -1, vertical); } |