From 0bf630493f6a2644dd6c0fc2bf745edd7a86a083 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 Apr 2021 01:20:02 +1000 Subject: Fix missing owner_id values from 919558854d624f5db40acfa9f5674ac8c94873b6 This prevented dynamic enum callbacks being called. --- source/blender/windowmanager/intern/wm_event_system.c | 2 +- source/blender/windowmanager/intern/wm_operator_type.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index cb4aa3b6549..2244f897597 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1621,7 +1621,7 @@ int WM_operator_name_call_with_properties(struct bContext *C, { PointerRNA props_ptr; wmOperatorType *ot = WM_operatortype_find(opstring, false); - RNA_pointer_create(NULL, ot->srna, properties, &props_ptr); + RNA_pointer_create(G_MAIN->wm.first, ot->srna, properties, &props_ptr); return WM_operator_name_call_ptr(C, ot, context, &props_ptr); } diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 0e57a92b685..f33db7d50b5 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -252,7 +252,7 @@ void WM_operatortype_props_advanced_end(wmOperatorType *ot) return; } - RNA_pointer_create(NULL, ot->srna, NULL, &struct_ptr); + WM_operator_properties_create_ptr(&struct_ptr, ot); RNA_STRUCT_BEGIN (&struct_ptr, prop) { counter++; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 9499ac56932..6f98ecfd621 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1207,7 +1207,7 @@ IDProperty *WM_operator_last_properties_ensure_idprops(wmOperatorType *ot) void WM_operator_last_properties_ensure(wmOperatorType *ot, PointerRNA *ptr) { IDProperty *props = WM_operator_last_properties_ensure_idprops(ot); - RNA_pointer_create(NULL, ot->srna, props, ptr); + RNA_pointer_create(G_MAIN->wm.first, ot->srna, props, ptr); } /** -- cgit v1.2.3