Merge branch 'blender-v2.93-release'

2021-04-23 10:17:25 +02:00
parent 425e19bc1f 2f6219c48d
commit ffa8563429
2 changed files with 7 additions and 0 deletions
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -4207,6 +4207,10 @@ static void pyrna_dir_members_rna(PyObject *list, PointerRNA *ptr)
    iterprop = RNA_struct_iterator_property(ptr->type);

    RNA_PROP_BEGIN (ptr, itemptr, iterprop) {
+      /* Custom-properties are exposed using `__getitem__`, exclude from `__dir__`. */
+      if (RNA_property_is_idprop(itemptr.data)) {
+        continue;
+      }
      nameptr = RNA_struct_name_get_alloc(&itemptr, name, sizeof(name), &namelen);

      if (nameptr) {