blender
/
blender
136
419
Fork 601
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

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.
This commit is contained in:
Campbell Barton 2018-08-30 13:06:03 +10:00
parent a4a9f4b3d1
commit 8ace389fc4
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_workspace.py
View File

@ -28,7 +28,7 @@ from rna_prop_ui import PropertyPanel
class WorkSpaceButtonsPanel:
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "workspace"
bl_context = ".workspace"
class WORKSPACE_PT_owner_ids(WorkSpaceButtonsPanel, Panel):

3
source/blender/editors/space_buttons/buttons_context.c
View File

@ -514,7 +514,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma
}
/* No pinned root, use scene as initial root. */
else {
if (ELEM(mainb, BCONTEXT_WORKSPACE, BCONTEXT_TOOL)) {
if (mainb == BCONTEXT_TOOL) {
RNA_id_pointer_create(&workspace->id, &path->ptr[0]);
path->len++;
}
@ -551,7 +551,6 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma
found = buttons_context_path_world(path);
break;
case BCONTEXT_TOOL:
case BCONTEXT_WORKSPACE:
found = buttons_context_path_workspace(path);
break;
case BCONTEXT_OBJECT:

12
source/blender/editors/space_buttons/space_buttons.c
View File

@ -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);
}

3
source/blender/makesdna/DNA_space_types.h
View File

@ -197,8 +197,7 @@ typedef enum eSpaceButtons_Context {
BCONTEXT_BONE_CONSTRAINT = 12,
BCONTEXT_VIEW_LAYER = 13,
BCONTEXT_TOOL = 14,
BCONTEXT_WORKSPACE = 15,
BCONTEXT_SHADERFX = 16,
BCONTEXT_SHADERFX = 15,
/* always as last... */
BCONTEXT_TOT

5
source/blender/makesrna/intern/rna_space.c
View File

@ -288,7 +288,6 @@ static const EnumPropertyItem buttons_context_items[] = {
{BCONTEXT_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture"},
{BCONTEXT_PARTICLE, "PARTICLES", ICON_PARTICLES, "Particles", "Particle"},
{BCONTEXT_PHYSICS, "PHYSICS", ICON_PHYSICS, "Physics", "Physics"},
{BCONTEXT_WORKSPACE, "WORKSPACE", ICON_SPLITSCREEN, "Workspace", "Workspace"},
{BCONTEXT_SHADERFX, "SHADERFX", ICON_SOLO_ON, "Effects", "Object visual effects" },
{0, NULL, 0, NULL, NULL}
};
@ -1319,10 +1318,6 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf(
RNA_enum_items_add_value(&item, &totitem, buttons_context_items, BCONTEXT_TOOL);
}
if (sbuts->pathflag & (1 << BCONTEXT_WORKSPACE)) {
RNA_enum_items_add_value(&item, &totitem, buttons_context_items, BCONTEXT_WORKSPACE);
}
if (totitem) {
RNA_enum_item_add_separator(&item, &totitem);
}