diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-25 16:56:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-26 17:37:59 +0300 |
| commit | 5876856f7bdaac74ae5b09afb5a2c81cdb4f873e (patch) | |
| tree | 1a4ef16f9ea63994685008f72d3683cf7ce80425 /source/blender/editors/space_buttons | |
| parent | 11995c5a6ec99f6b08cc2bbb315fd237659356cc (diff) | |
Properties: remove redundant settings from workspaces tab.
Use render settings and active view layer will be handled elsewhere.
Also change icon to not be confusing with render layers.
Probably we should get rid of the workspace tab entirely and do it in
the user preferences, but that's for later.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index b7ba8b5e065..e8faf794bb8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -501,8 +501,6 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma memset(path, 0, sizeof(*path)); path->flag = flag; - const bool use_scene_settings = BKE_workspace_use_scene_settings_get(workspace); - /* If some ID datablock is pinned, set the root pointer. */ if (sbuts->pinid) { id = sbuts->pinid; @@ -512,8 +510,8 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma } /* No pinned root, use scene or workspace as initial root. */ else { - if ((mainb != BCONTEXT_WORKSPACE) && (use_scene_settings || - ELEM(mainb, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_VIEW_LAYER, BCONTEXT_WORLD))) + if ((mainb != BCONTEXT_WORKSPACE) && + ELEM(mainb, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_VIEW_LAYER, BCONTEXT_WORLD)) { RNA_id_pointer_create(&scene->id, &path->ptr[0]); path->len++; |