diff options
| author | YimingWu <xp8110@outlook.com> | 2019-12-03 08:30:50 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2019-12-03 08:30:50 +0300 |
| commit | 7f81bb4931acaab2749def9f4fcf5c08509eb92b (patch) | |
| tree | befeb67d6a084313c64f9e3ddd1c08d3f5959135 /source/blender/python | |
| parent | 2243de9a9075b2e3de59208083a5804bf7a11085 (diff) | |
| parent | a81fdefddebc0eec3e324cf6a9d8c51050d3e749 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 6fb2b2fd7ee..d49e782c317 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -7818,7 +7818,7 @@ static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict) } } - { + if (ret == 0) { /* 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)) { |