diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-25 03:13:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-25 03:15:48 +0300 |
| commit | bf34f95a9ed1b5bafc31360459bee3ce13714371 (patch) | |
| tree | 4e46b80bfb30ec200c2880bd5cffb0a5b899742c /source/blender/editors/space_buttons/space_buttons.c | |
| parent | 03e0fd289dd970a82848a1921fe216c166857a03 (diff) | |
UI: move 2d paint panels to topbar & toolsettings
Removed 'Tool' and 'Options' panels,
both these settings are quite obscure and
already available in the 'Brush' menu.
Diffstat (limited to 'source/blender/editors/space_buttons/space_buttons.c')
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 7820012ad14..8d2b5f994b3 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -260,9 +260,19 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) } } else if (workspace->tools_space_type == SPACE_IMAGE) { - switch (mode) { - case CTX_MODE_EDIT_MESH: - ARRAY_SET_ITEMS(contexts, ".uv_sculpt"); + switch (workspace->tools_mode) { + case SI_MODE_VIEW: + break; + case SI_MODE_PAINT: + ARRAY_SET_ITEMS(contexts, ".paint_common_2d", ".imagepaint_2d"); + break; + case SI_MODE_MASK: + break; + case SI_MODE_UV: + if (mode == CTX_MODE_EDIT_MESH) { + ARRAY_SET_ITEMS(contexts, ".uv_sculpt"); + } + break; } } |