From 81178eca7cd85b3f07a3c78ff6618639eaf4c562 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Mar 2021 12:19:13 +1100 Subject: Revert removal of lambda usage for Python RNA callbacks This reverts commits - 476be3746e85b4891189c8d480501905b9400c66 - 8d50a3e19e025ef470132e7edadd7b180db833f5 - 08dbc4f996e4e95f3ab64f7bb3e1193700c585f5 (partially). --- release/scripts/startup/bl_operators/wm.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'release/scripts/startup/bl_operators') diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 06b3b4defcc..2f97942faa4 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -860,7 +860,9 @@ class WM_OT_url_open_preset(Operator): type: EnumProperty( name="Site", - items=WM_OT_url_open_preset._preset_items, + items=lambda self, _context: ( + item for (item, _) in WM_OT_url_open_preset.preset_items + ), ) id: StringProperty( @@ -915,10 +917,6 @@ class WM_OT_url_open_preset(Operator): "https://www.blender.org/about/credits/"), ] - @staticmethod - def _preset_items(_self, _context): - return (item for (item, _) in WM_OT_url_open_preset.preset_items) - def execute(self, context): url = None type = self.type @@ -1220,14 +1218,11 @@ class WM_OT_properties_edit(Operator): ) subtype: EnumProperty( name="Subtype", - items=WM_OT_properties_edit._subtype_items_fn, + items=lambda self, _context: WM_OT_properties_edit.subtype_items, ) subtype_items = rna_vector_subtype_items - def _subtype_items_fn(_self, _context): - return WM_OT_properties_edit.subtype_items - def _init_subtype(self, prop_type, is_array, subtype): subtype = subtype or 'NONE' subtype_items = rna_vector_subtype_items -- cgit v1.2.3