From 1af652d42eb917e257d0f4f2773258f4f6ad2a45 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 8 Jun 2022 10:38:08 +0200 Subject: Fix: Improve poll for convert attribute operator Converting an attribute does not work from edit mode because there is no attribute API implemented for BMesh, so disable the operation in that mode and add a poll message. --- source/blender/editors/geometry/geometry_attributes.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/geometry/geometry_attributes.cc') diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index ed5787c8277..ae588e49565 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/source/blender/editors/geometry/geometry_attributes.cc @@ -261,8 +261,11 @@ static bool geometry_attribute_convert_poll(bContext *C) if (GS(data->name) != ID_ME) { return false; } - CustomDataLayer *layer = BKE_id_attributes_active_get(data); - if (layer == nullptr) { + if (CTX_data_edit_object(C) != nullptr) { + CTX_wm_operator_poll_msg_set(C, "Operation is not allowed in edit mode"); + return false; + } + if (BKE_id_attributes_active_get(data) == nullptr) { return false; } return true; -- cgit v1.2.3