From 5db950e860b2f64078cfc8cf00cb4f430b8a1baf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 9 Feb 2018 22:14:17 +1100 Subject: Cleanup: use workspace for object_mode when possible --- source/blender/editors/object/object_facemap_ops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/object/object_facemap_ops.c') diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 87c1f5a10c2..c865b45889a 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -35,6 +35,7 @@ #include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -174,9 +175,8 @@ static int face_map_supported_edit_mode_poll(bContext *C) Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; if (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib) { - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); - if (eval_ctx.object_mode == OB_MODE_EDIT) { + const WorkSpace *workspace = CTX_wm_workspace(C); + if (workspace->object_mode == OB_MODE_EDIT) { return true; } } -- cgit v1.2.3