diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-02 10:56:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-02 10:56:31 +0400 |
commit | 0c62d107e04a43d8cf78af41e52368497cf338f0 (patch) | |
tree | 0eebf4d4c1235219f91d89dde2f976ad9cd3137c /release/scripts/modules/bpy_types.py | |
parent | 55e64f0ba4f43535a163090ddf6a1715de0a6fa4 (diff) |
minor changes to registration before committing addons fixes
Diffstat (limited to 'release/scripts/modules/bpy_types.py')
-rw-r--r-- | release/scripts/modules/bpy_types.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index a5161768bea..02e458b48c2 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -551,29 +551,32 @@ PropertiesMap = {} # registers moduals instantly. _register_immediate = True -def UnloadModule(module): - for t in TypeMap.setdefault(module, ()): +def _unload_module(module): + for t in TypeMap.get(module, ()): bpy_types.unregister(t) - - del TypeMap[module] - for t in PropertiesMap.setdefault(module, ()): + if module in TypeMap: + del TypeMap[module] + + + for t in PropertiesMap.get(module, ()): bpy_types.unregister(t) - - del PropertiesMap[module] -def LoadModule(module, force=False): + if module in PropertiesMap: + del PropertiesMap[module] + +def _load_module(module, force=False): for t in TypeMap.get(module, ()): bpy_types.register(t) -_bpy.LoadModule = LoadModule -_bpy.UnloadModule = UnloadModule +_bpy._load_module = _load_module +_bpy._unload_module = _unload_module class RNAMeta(type): @classmethod def _register_immediate(cls): return _register_immediate - + def __new__(cls, name, bases, classdict, **args): result = type.__new__(cls, name, bases, classdict) if bases and bases[0] != StructRNA: @@ -589,7 +592,7 @@ class RNAMeta(type): # first part of packages only if "." in module: module = module[:module.index(".")] - + ClassMap.setdefault(module, []).append(result) return result |