[Bf-blender-cvs] [e4c53d9163b] blender2.8: Missing from last commit
Campbell Barton
noreply at git.blender.org
Thu Sep 20 06:44:49 CEST 2018
Commit: e4c53d9163bbb4e6fa2288757e34fd24d8dc0b63
Author: Campbell Barton
Date: Thu Sep 20 14:56:36 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe4c53d9163bbb4e6fa2288757e34fd24d8dc0b63
Missing from last commit
===================================================================
M source/blender/python/intern/bpy_rna.c
===================================================================
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 9703114016a..6a525ec40c6 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -7437,15 +7437,17 @@ static int deferred_register_prop(StructRNA *srna, PyObject *key, PyObject *item
static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict)
{
- PyObject *fields_dict;
+ PyObject *annotations_dict;
PyObject *item, *key;
Py_ssize_t pos = 0;
int ret = 0;
/* in both cases PyDict_CheckExact(class_dict) will be true even
* though Operators have a metaclass dict namespace */
- if ((fields_dict = PyDict_GetItem(class_dict, bpy_intern_str___annotations__)) && PyDict_CheckExact(fields_dict)) {
- while (PyDict_Next(fields_dict, &pos, &key, &item)) {
+ if ((annotations_dict = PyDict_GetItem(class_dict, bpy_intern_str___annotations__)) &&
+ PyDict_CheckExact(annotations_dict))
+ {
+ while (PyDict_Next(annotations_dict, &pos, &key, &item)) {
ret = deferred_register_prop(srna, key, item);
if (ret != 0) {
@@ -7455,7 +7457,7 @@ static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict)
}
{
- /* This block can be removed once 2.8x is released and fields are in use. */
+ /* This block can be removed once 2.8x is released and annotations are in use. */
bool has_warning = false;
while (PyDict_Next(class_dict, &pos, &key, &item)) {
if (pyrna_is_deferred_prop(item)) {
More information about the Bf-blender-cvs
mailing list