diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-02 22:31:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-02 22:33:46 +0300 |
commit | e3e3f3851cba6626d85076e129cedd21fa529da8 (patch) | |
tree | 15c0f608f8b90c0a1f17a20a1942309ad0579ae1 /release | |
parent | f51ef8ac4d3f94036463fac9fb59ec8266e0197d (diff) |
Cleanup: replace dict /w list for module reload
Never used keys and better reload in same order loaded.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/__init__.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py index 35c7a55b6da..b92eed0e32a 100644 --- a/release/scripts/startup/bl_operators/__init__.py +++ b/release/scripts/startup/bl_operators/__init__.py @@ -20,9 +20,10 @@ if "bpy" in locals(): from importlib import reload - for val in _modules_loaded.values(): + for val in _modules_loaded: reload(val) del reload + _modules = [ "add_mesh_torus", "anim", @@ -47,15 +48,16 @@ _modules = [ "vertexpaint_dirt", "view3d", "wm", -] + ] import bpy if bpy.app.build_options.freestyle: _modules.append("freestyle") + __import__(name=__name__, fromlist=_modules) _namespace = globals() -_modules_loaded = {name: _namespace[name] for name in _modules if name != "bpy"} +_modules_loaded = [_namespace[name] for name in _modules] del _namespace diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index c110b429aad..9979fa3f17b 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -22,9 +22,10 @@ if "bpy" in locals(): from importlib import reload - for val in _modules_loaded.values(): + for val in _modules_loaded: reload(val) del reload + _modules = [ "properties_animviz", "properties_constraint", @@ -78,15 +79,16 @@ _modules = [ "space_userpref", "space_view3d", "space_view3d_toolbar", -] + ] import bpy if bpy.app.build_options.freestyle: _modules.append("properties_freestyle") + __import__(name=__name__, fromlist=_modules) _namespace = globals() -_modules_loaded = {name: _namespace[name] for name in _modules if name != "bpy"} +_modules_loaded = [_namespace[name] for name in _modules] del _namespace diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 7af10aab648..780662148e0 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -118,7 +118,7 @@ def line_style_shader_nodes_poll(context): def world_shader_nodes_poll(context): snode = context.space_data return (snode.tree_type == 'ShaderNodeTree' and - snode.shader_type == 'WORLD') + snode.shader_type == 'WORLD') # only show nodes working in object node trees |