diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 14:14:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 14:14:39 +0300 |
| commit | 5db950e860b2f64078cfc8cf00cb4f430b8a1baf (patch) | |
| tree | b9a734351e0cfa849c3c136e4fc6f26276c7c5c0 /source/blender/blenkernel/intern/context.c | |
| parent | 25074be697cb5726328aa5d064a60788c1da6aeb (diff) | |
Cleanup: use workspace for object_mode when possible
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 8b7356eaa9e..2af3b6ce593 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -1035,11 +1035,10 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectM int CTX_data_mode_enum(const bContext *C) { - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); + const WorkSpace *workspace = CTX_wm_workspace(C); Object *obedit = CTX_data_edit_object(C); Object *obact = obedit ? NULL : CTX_data_active_object(C); - return CTX_data_mode_enum_ex(obedit, obact, eval_ctx.object_mode); + return CTX_data_mode_enum_ex(obedit, obact, workspace->object_mode); } /* would prefer if we can use the enum version below over this one - Campbell */ |