Commit: 20c4aa13de7ba403e113df8ec69c632b6815eac8 Author: Bastien Montagne Date: Mon Nov 2 17:07:39 2020 +0100 Branches: master https://developer.blender.org/rB20c4aa13de7ba403e113df8ec69c632b6815eac8
Cleanup: store results of function calls in const values. =================================================================== M source/blender/python/intern/bpy_props.c =================================================================== diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index d45c8e8b131..a2552ab25b9 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -3388,7 +3388,10 @@ PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *kw) if (!ptype) { return NULL; } - if (!RNA_struct_is_a(ptype, &RNA_PropertyGroup) && !RNA_struct_is_ID(ptype)) { + const bool is_property_group = RNA_struct_is_a(ptype, &RNA_PropertyGroup); + const bool is_id = RNA_struct_is_ID(ptype); + + if (!is_property_group && !is_id) { PyErr_Format(PyExc_TypeError, "PointerProperty(...) expected an RNA type derived from %.200s or %.200s", RNA_struct_ui_name(&RNA_ID), @@ -3413,7 +3416,7 @@ PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *kw) } if (RNA_struct_idprops_contains_datablock(ptype)) { - if (RNA_struct_is_a(srna, &RNA_PropertyGroup)) { + if (is_property_group) { RNA_def_struct_flag(srna, STRUCT_CONTAINS_DATABLOCK_IDPROPERTIES); } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs