[Bf-blender-cvs] [43c22eda88] app-templates: Check classes are registered before unregistering
Campbell Barton
noreply at git.blender.org
Thu Mar 16 20:02:35 CET 2017
Commit: 43c22eda8822c2048dece74c1f7ac63c0b590cbf
Author: Campbell Barton
Date: Fri Mar 17 06:06:18 2017 +1100
Branches: app-templates
https://developer.blender.org/rB43c22eda8822c2048dece74c1f7ac63c0b590cbf
Check classes are registered before unregistering
===================================================================
M release/scripts/modules/bl_app_override.py
===================================================================
diff --git a/release/scripts/modules/bl_app_override.py b/release/scripts/modules/bl_app_override.py
index 873f25c5a4..b9c83fefcc 100644
--- a/release/scripts/modules/bl_app_override.py
+++ b/release/scripts/modules/bl_app_override.py
@@ -33,8 +33,10 @@ def class_filter(cls_parent, **kw):
black_list = kw.pop("black_list", None)
kw_items = tuple(kw.items())
for cls in cls_parent.__subclasses__():
- if black_list is not None and cls.__name__ in black_list:
- continue
- if ((white_list is not None and cls.__name__ is white_list) or
- all((getattr(cls, attr) in expect) for attr, expect in kw_items)):
- yield cls
+ # same as is_registered()
+ if "bl_rna" in cls.__dict__:
+ if black_list is not None and cls.__name__ in black_list:
+ continue
+ if ((white_list is not None and cls.__name__ is white_list) or
+ all((getattr(cls, attr) in expect) for attr, expect in kw_items)):
+ yield cls
More information about the Bf-blender-cvs
mailing list