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 | |
| 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')
| -rw-r--r-- | source/blender/blenkernel/BKE_workspace.h | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 7 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 16 |
3 files changed, 1 insertions, 26 deletions
diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h index 5dee6b8c44f..5ee15a08f9b 100644 --- a/source/blender/blenkernel/BKE_workspace.h +++ b/source/blender/blenkernel/BKE_workspace.h @@ -109,10 +109,6 @@ struct WorkSpaceLayout *BKE_workspace_hook_layout_for_workspace_get( void BKE_workspace_hook_layout_for_workspace_set( struct WorkSpaceInstanceHook *hook, struct WorkSpace *workspace, struct WorkSpaceLayout *layout) ATTR_NONNULL(); -/* flags */ -bool BKE_workspace_use_scene_settings_get(const struct WorkSpace *workspace) GETTER_ATTRS; -void BKE_workspace_use_scene_settings_set(struct WorkSpace *workspace, bool value) SETTER_ATTRS; - /* Update / evaluate */ void BKE_workspace_update_tagged(struct Main *bmain, struct WorkSpace *workspace, 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); } /** diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 8de62f82c1b..38378f66584 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -440,22 +440,6 @@ void BKE_workspace_hook_layout_for_workspace_set( workspace_relation_ensure_updated(&workspace->hook_layout_relations, hook, layout); } -/* Flags */ -bool BKE_workspace_use_scene_settings_get(const WorkSpace *workspace) -{ - return (workspace->flags & WORKSPACE_USE_SCENE_SETTINGS) != 0; -} - -void BKE_workspace_use_scene_settings_set(WorkSpace *workspace, bool value) -{ - if (value) { - workspace->flags |= WORKSPACE_USE_SCENE_SETTINGS; - } - else { - workspace->flags &= ~WORKSPACE_USE_SCENE_SETTINGS; - } -} - /* Update / evaluate */ void BKE_workspace_update_tagged(Main *bmain, |