diff --git a/source/blender/editors/include/UI_interface_layout.hh b/source/blender/editors/include/UI_interface_layout.hh index 7d4da93367c..5e6e22ae5a4 100644 --- a/source/blender/editors/include/UI_interface_layout.hh +++ b/source/blender/editors/include/UI_interface_layout.hh @@ -561,7 +561,6 @@ void uiItemFullOMenuHold_ptr(uiLayout *layout, wmOperatorType *ot, std::optional name, int icon, - IDProperty *properties, wmOperatorCallContext context, eUI_Item_Flag flag, const char *menu_id, /* extra menu arg. */ diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 74de0af2537..2025dfb43fd 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -1227,7 +1227,6 @@ static uiBut *uiItemFullO_ptr_ex(uiLayout *layout, wmOperatorType *ot, std::optional name, int icon, - IDProperty *properties, const wmOperatorCallContext context, const eUI_Item_Flag flag, PointerRNA *r_opptr) @@ -1299,17 +1298,10 @@ static uiBut *uiItemFullO_ptr_ex(uiLayout *layout, } /* assign properties */ - if (properties || r_opptr) { + if (r_opptr) { PointerRNA *opptr = UI_but_operator_ptr_ensure(but); - if (properties) { - opptr->data = properties; - } - else { - opptr->data = blender::bke::idprop::create_group("wmOperatorProperties").release(); - } - if (r_opptr) { - *r_opptr = *opptr; - } + opptr->data = blender::bke::idprop::create_group("wmOperatorProperties").release(); + *r_opptr = *opptr; } return but; @@ -1363,7 +1355,7 @@ PointerRNA uiLayout::op(wmOperatorType *ot, const eUI_Item_Flag flag) { PointerRNA ptr; - uiItemFullO_ptr_ex(this, ot, name, icon, nullptr, context, flag, &ptr); + uiItemFullO_ptr_ex(this, ot, name, icon, context, flag, &ptr); return ptr; } @@ -1371,13 +1363,12 @@ void uiItemFullOMenuHold_ptr(uiLayout *layout, wmOperatorType *ot, std::optional name, int icon, - IDProperty *properties, const wmOperatorCallContext context, const eUI_Item_Flag flag, const char *menu_id, PointerRNA *r_opptr) { - uiBut *but = uiItemFullO_ptr_ex(layout, ot, name, icon, properties, context, flag, r_opptr); + uiBut *but = uiItemFullO_ptr_ex(layout, ot, name, icon, context, flag, r_opptr); UI_but_func_hold_set(but, ui_item_menu_hold, BLI_strdup(menu_id)); } diff --git a/source/blender/makesrna/intern/rna_ui_api.cc b/source/blender/makesrna/intern/rna_ui_api.cc index efff520e630..1a2088701ea 100644 --- a/source/blender/makesrna/intern/rna_ui_api.cc +++ b/source/blender/makesrna/intern/rna_ui_api.cc @@ -415,7 +415,7 @@ static PointerRNA rna_uiItemOMenuHold(uiLayout *layout, PointerRNA opptr; uiItemFullOMenuHold_ptr( - layout, ot, text, icon, nullptr, uiLayoutGetOperatorContext(layout), flag, menu, &opptr); + layout, ot, text, icon, uiLayoutGetOperatorContext(layout), flag, menu, &opptr); return opptr; }