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/blenkernel/intern/layer.c | |
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/blenkernel/intern/layer.c')
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 15585d852b9..41bdc3bb9ef 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -91,12 +91,7 @@ ViewLayer *BKE_view_layer_from_scene_get(const Scene *scene) */ ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace) { - if (BKE_workspace_use_scene_settings_get(workspace)) { - return BKE_view_layer_from_scene_get(scene); - } - else { - return BKE_workspace_view_layer_get(workspace, scene); - } + return BKE_workspace_view_layer_get(workspace, scene); } /** |