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/depsgraph/intern/depsgraph_eval.cc | |
| 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/depsgraph/intern/depsgraph_eval.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index d76eba29628..0b3e4fd8db9 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -84,7 +84,6 @@ void DEG_evaluation_context_init_from_scene( Scene *scene, ViewLayer *view_layer, RenderEngineType *engine_type, - eObjectMode object_mode, eEvaluationMode mode) { DEG_evaluation_context_init(eval_ctx, mode); @@ -92,7 +91,6 @@ void DEG_evaluation_context_init_from_scene( eval_ctx->view_layer = view_layer; eval_ctx->engine_type = engine_type; eval_ctx->ctime = BKE_scene_frame_get(scene); - eval_ctx->object_mode = object_mode; } void DEG_evaluation_context_init_from_view_layer_for_render( @@ -107,7 +105,6 @@ void DEG_evaluation_context_init_from_view_layer_for_render( DEG_evaluation_context_init(eval_ctx, DAG_EVAL_RENDER); eval_ctx->ctime = BKE_scene_frame_get(scene); - eval_ctx->object_mode = OB_MODE_OBJECT; eval_ctx->depsgraph = depsgraph; eval_ctx->view_layer = view_layer_original; eval_ctx->engine_type = NULL; @@ -121,7 +118,6 @@ void DEG_evaluation_context_init_from_depsgraph( Scene *scene = DEG_get_evaluated_scene(depsgraph); DEG_evaluation_context_init(eval_ctx, mode); eval_ctx->ctime = (float)scene->r.cfra + scene->r.subframe; - eval_ctx->object_mode = OB_MODE_OBJECT; eval_ctx->depsgraph = depsgraph; eval_ctx->view_layer = DEG_get_evaluated_view_layer(depsgraph); eval_ctx->engine_type = NULL; |