Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-20 07:56:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-20 07:57:01 +0300
commite4c53d9163bbb4e6fa2288757e34fd24d8dc0b63 (patch)
treee6ec100ce8b2e4d616ee3d00122e18b20ef95ddf /source/blender/python/intern/bpy_rna.c
parente228574417e66436c682e120c916bd21f292feda (diff)
Missing from last commit
Diffstat (limited to 'source/blender/python/intern/bpy_rna.c')
-rw-r--r--source/blender/python/intern/bpy_rna.c10
1 files changed, 6 insertions, 4 deletions
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)) {