[Bf-blender-cvs] [627a3446351] master: Fix (unreported) broken python resgistrable classes checks logic.

Bastien Montagne noreply at git.blender.org
Thu Nov 28 16:03:20 CET 2019


Commit: 627a34463511647e9a697ebd62a03478ec75a7d1
Author: Bastien Montagne
Date:   Thu Nov 28 15:50:31 2019 +0100
Branches: master
https://developer.blender.org/rB627a34463511647e9a697ebd62a03478ec75a7d1

Fix (unreported) broken python resgistrable classes checks logic.

Logic for registering and checking properties of registrable classes was
broken, allowing to ignore some errors.

Recent fix rBeb798de101a `broke` the result of the
pyapi_idprop_datablock test, because previously that test would fail
(i.e. suceed, as it is an 'expected to break test') for a reason it was
not designed to check.

This is the problem with that kind of tests - you cannot really check
that they are failing on the expected reason(s)...

===================================================================

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 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)) {



More information about the Bf-blender-cvs mailing list