Cleanup: replace dict /w list for module reload

Never used keys and better reload in same order loaded.
This commit is contained in:
Campbell Barton
2016-03-03 06:31:11 +11:00
parent f51ef8ac4d
commit e3e3f3851c
3 changed files with 11 additions and 7 deletions

View File

@@ -20,9 +20,10 @@
if "bpy" in locals(): if "bpy" in locals():
from importlib import reload from importlib import reload
for val in _modules_loaded.values(): for val in _modules_loaded:
reload(val) reload(val)
del reload del reload
_modules = [ _modules = [
"add_mesh_torus", "add_mesh_torus",
"anim", "anim",
@@ -47,15 +48,16 @@ _modules = [
"vertexpaint_dirt", "vertexpaint_dirt",
"view3d", "view3d",
"wm", "wm",
] ]
import bpy import bpy
if bpy.app.build_options.freestyle: if bpy.app.build_options.freestyle:
_modules.append("freestyle") _modules.append("freestyle")
__import__(name=__name__, fromlist=_modules) __import__(name=__name__, fromlist=_modules)
_namespace = globals() _namespace = globals()
_modules_loaded = {name: _namespace[name] for name in _modules if name != "bpy"} _modules_loaded = [_namespace[name] for name in _modules]
del _namespace del _namespace

View File

@@ -22,9 +22,10 @@
if "bpy" in locals(): if "bpy" in locals():
from importlib import reload from importlib import reload
for val in _modules_loaded.values(): for val in _modules_loaded:
reload(val) reload(val)
del reload del reload
_modules = [ _modules = [
"properties_animviz", "properties_animviz",
"properties_constraint", "properties_constraint",
@@ -78,15 +79,16 @@ _modules = [
"space_userpref", "space_userpref",
"space_view3d", "space_view3d",
"space_view3d_toolbar", "space_view3d_toolbar",
] ]
import bpy import bpy
if bpy.app.build_options.freestyle: if bpy.app.build_options.freestyle:
_modules.append("properties_freestyle") _modules.append("properties_freestyle")
__import__(name=__name__, fromlist=_modules) __import__(name=__name__, fromlist=_modules)
_namespace = globals() _namespace = globals()
_modules_loaded = {name: _namespace[name] for name in _modules if name != "bpy"} _modules_loaded = [_namespace[name] for name in _modules]
del _namespace del _namespace

View File

@@ -118,7 +118,7 @@ def line_style_shader_nodes_poll(context):
def world_shader_nodes_poll(context): def world_shader_nodes_poll(context):
snode = context.space_data snode = context.space_data
return (snode.tree_type == 'ShaderNodeTree' and return (snode.tree_type == 'ShaderNodeTree' and
snode.shader_type == 'WORLD') snode.shader_type == 'WORLD')
# only show nodes working in object node trees # only show nodes working in object node trees