[Bf-blender-cvs] [1af652d42eb] master: Fix: Improve poll for convert attribute operator

Hans Goudey noreply at git.blender.org
Wed Jun 8 10:51:22 CEST 2022


Commit: 1af652d42eb917e257d0f4f2773258f4f6ad2a45
Author: Hans Goudey
Date:   Wed Jun 8 10:38:08 2022 +0200
Branches: master
https://developer.blender.org/rB1af652d42eb917e257d0f4f2773258f4f6ad2a45

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.

===================================================================

M	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;



More information about the Bf-blender-cvs mailing list