WM: replace UI draw callbacks w/ property poll

Custom drawing functions were used just to control property display.
Move to poll function.

1 files changed, 3 insertions, 15 deletions

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index c5c670b77ea..3e4f8232e62 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -5373,10 +5373,10 @@ static int edbm_sort_elements_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-static bool edbm_sort_elements_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data))
+static bool edbm_sort_elements_poll_property(const bContext *UNUSED(C), wmOperator *op, const PropertyRNA *prop)
 {
 	const char *prop_id = RNA_property_identifier(prop);
-	const int action = RNA_enum_get(ptr, "type");
+	const int action = RNA_enum_get(op->ptr, "type");
 
 	/* Only show seed for randomize action! */
 	if (STREQ(prop_id, "seed")) {
@@ -5397,18 +5397,6 @@ static bool edbm_sort_elements_draw_check_prop(PointerRNA *ptr, PropertyRNA *pro
 	return true;
 }
 
-static void edbm_sort_elements_ui(bContext *C, wmOperator *op)
-{
-	uiLayout *layout = op->layout;
-	wmWindowManager *wm = CTX_wm_manager(C);
-	PointerRNA ptr;
-
-	RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
-
-	/* Main auto-draw call. */
-	uiDefAutoButsRNA(layout, &ptr, edbm_sort_elements_draw_check_prop, NULL, '\0');
-}
-
 void MESH_OT_sort_elements(wmOperatorType *ot)
 {
 	static const EnumPropertyItem type_items[] = {
@@ -5444,7 +5432,7 @@ void MESH_OT_sort_elements(wmOperatorType *ot)
 	ot->invoke = WM_menu_invoke;
 	ot->exec = edbm_sort_elements_exec;
 	ot->poll = ED_operator_editmesh;
-	ot->ui = edbm_sort_elements_ui;
+	ot->poll_property = edbm_sort_elements_poll_property;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;