blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-04-28 16:09:19 +10:00
parent a5bb028e78 36863cf129
commit 1128258c03
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/makesrna/intern/rna_wm.c
View File

@ -604,14 +604,22 @@ static PointerRNA rna_Operator_options_get(PointerRNA *ptr)
static PointerRNA rna_Operator_properties_get(PointerRNA *ptr)
{
wmOperator *op = (wmOperator *)ptr->data;
return rna_pointer_inherit_refine(ptr, op->type->srna, op->properties);
PointerRNA result;
WM_operator_properties_create_ptr(&result, op->type);
result.data = op->properties;
return result;
}
static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr)
{
wmOperatorTypeMacro *otmacro = (wmOperatorTypeMacro *)ptr->data;
wmOperatorType *ot = WM_operatortype_find(otmacro->idname, true);
return rna_pointer_inherit_refine(ptr, ot->srna, otmacro->properties);
PointerRNA result;
WM_operator_properties_create_ptr(&result, ot);
result.data = otmacro->properties;
return result;
}
static const EnumPropertyItem *rna_Event_value_itemf(bContext *UNUSED(C),