From 919558854d624f5db40acfa9f5674ac8c94873b6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 16 Apr 2021 15:04:59 +1000 Subject: Fix T65064: Keymaps items controlling dynamic enums fail to export Keymap UI and import/export could depend on the current context for dynamic enum's. Use STRUCT_NO_CONTEXT_WITHOUT_OWNER_ID for OperatorProperties. --- source/blender/makesrna/intern/rna_wm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 4a51db4e652..d7a988383a7 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -880,6 +880,7 @@ static PointerRNA rna_KeyMapItem_properties_get(PointerRNA *ptr) wmKeyMapItem *kmi = ptr->data; if (kmi->ptr) { + BLI_assert(kmi->ptr->owner_id == NULL); return *(kmi->ptr); } @@ -1974,7 +1975,7 @@ static void rna_def_operator(BlenderRNA *brna) RNA_def_struct_refine_func(srna, "rna_OperatorProperties_refine"); RNA_def_struct_idprops_func(srna, "rna_OperatorProperties_idprops"); RNA_def_struct_property_tags(srna, rna_enum_operator_property_tags); - RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES); + RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES | STRUCT_NO_CONTEXT_WITHOUT_OWNER_ID); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); } -- cgit v1.2.3