[Bf-blender-cvs] [916e51a4078] master: PyRNA: support separators in enum-items lists
Campbell Barton
noreply at git.blender.org
Mon Aug 5 15:15:32 CEST 2019
Commit: 916e51a4078b452774b2696d1daeb7286ab3f085
Author: Campbell Barton
Date: Mon Aug 5 23:10:44 2019 +1000
Branches: master
https://developer.blender.org/rB916e51a4078b452774b2696d1daeb7286ab3f085
PyRNA: support separators in enum-items lists
Resolves T68260
===================================================================
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 50c61dd0061..70bfa76e344 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -1505,6 +1505,10 @@ static const EnumPropertyItem *enum_items_from_py(PyObject *seq_fast,
/* calculate combine string length */
totbuf += id_str_size + name_str_size + desc_str_size + 3; /* 3 is for '\0's */
}
+ else if (item == Py_None) {
+ /* Only set since the rest is cleared. */
+ items[i].identifier = "";
+ }
else {
MEM_freeN(items);
PyErr_SetString(PyExc_TypeError,
@@ -2979,6 +2983,8 @@ PyDoc_STRVAR(
" When an item only contains 4 items they define ``(identifier, name, description, "
"number)``.\n"
"\n"
+ " Separators may be added using None instead of a tuple."
+ "\n"
" For dynamic values a callback can be passed which returns a list in\n"
" the same format as the static list.\n"
" This function must take 2 arguments ``(self, context)``, **context may be None**.\n"
More information about the Bf-blender-cvs
mailing list