[Bf-blender-cvs] [0bf630493f6] blender-v2.93-release: Fix missing owner_id values from 919558854d624f5db40acfa9f5674ac8c94873b6
Campbell Barton
noreply at git.blender.org
Fri Apr 16 17:31:39 CEST 2021
Commit: 0bf630493f6a2644dd6c0fc2bf745edd7a86a083
Author: Campbell Barton
Date: Sat Apr 17 01:20:02 2021 +1000
Branches: blender-v2.93-release
https://developer.blender.org/rB0bf630493f6a2644dd6c0fc2bf745edd7a86a083
Fix missing owner_id values from 919558854d624f5db40acfa9f5674ac8c94873b6
This prevented dynamic enum callbacks being called.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operator_type.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
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);
}
/**
More information about the Bf-blender-cvs
mailing list