diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:20:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:21:14 +0300 |
commit | 1c24c04e6023f2d2a328dfcdc9f86cd381d029a3 (patch) | |
tree | 7a5af59ce078cb66fb17ec33cf111ffc8d5fb328 /source/blender/blenkernel/intern/workspace.c | |
parent | 57329304b061efe756e3a4ce1b828e9a7c7f7030 (diff) |
Remove workspace object mode, reverts changes w/ 2.8
This caused too many problems syncing object modes
with multiple objects/windows/workspaces, see: D3130 for details.
Diffstat (limited to 'source/blender/blenkernel/intern/workspace.c')
-rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 301084e22fc..26a680c881f 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -511,30 +511,6 @@ void BKE_workspace_update_tagged(struct EvaluationContext *eval_ctx, BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, view_layer); } -void BKE_workspace_update_object_mode( - struct EvaluationContext *eval_ctx, - WorkSpace *workspace) -{ - /* TODO(campbell): Investigate how this should work exactly, - * for now without this 'bmain->eval_ctx' is never set. */ - - eval_ctx->object_mode = workspace->object_mode; -} - -Object *BKE_workspace_edit_object(WorkSpace *workspace, Scene *scene) -{ - if (workspace->object_mode & OB_MODE_EDIT) { - ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene); - if (view_layer) { - Object *obedit = OBACT(view_layer); - if (obedit) { - BLI_assert(BKE_object_is_in_editmode(obedit)); - return obedit; - } - } - } - return NULL; -} bool BKE_workspace_owner_id_check( const WorkSpace *workspace, const char *owner_id) @@ -549,3 +525,4 @@ bool BKE_workspace_owner_id_check( return BLI_findstring(&workspace->owner_ids, owner_id, offsetof(wmOwnerID, name)) != NULL; } } + |