diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 09:53:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 10:03:29 +0300 |
| commit | 2a184f3d2b6cc180fedd0c93c266d847f7d27936 (patch) | |
| tree | 5d7472cb10888e6e18dd64bbcdb3c078ac325ca0 /source/blender/editors/object/object_facemap_ops.c | |
| parent | 906ed54d286d0dd6686aac997883e7dfa4bba792 (diff) | |
Object Mode: use eval_ctx for paint & object
Diffstat (limited to 'source/blender/editors/object/object_facemap_ops.c')
| -rw-r--r-- | source/blender/editors/object/object_facemap_ops.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 857446ac6b0..87c1f5a10c2 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -173,7 +173,14 @@ static int face_map_supported_edit_mode_poll(bContext *C) { Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; - return (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib && ob->mode == OB_MODE_EDIT); + 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) { + return true; + } + } + return false; } static int face_map_add_exec(bContext *C, wmOperator *UNUSED(op)) |