sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

ignore scripts that are loaded twice rather then raising an error.

Browse Source
This commit is contained in:
Campbell Barton 2010-02-16 13:13:22 +00:00
parent 62e7e0ce77
commit a789942219
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/modules/bpy/utils.py
View File

@ -39,16 +39,18 @@ def _test_import(module_name, loaded_modules):
print("Ignoring '%s', can't import files containing multiple periods." % module_name)
return None
t = time.time()
try:
t = time.time()
ret = __import__(module_name)
if _bpy.app.debug:
print("time %s %.4f" % (module_name, time.time() - t))
return ret
mod = __import__(module_name)
except:
traceback.print_exc()
return None
if _bpy.app.debug:
print("time %s %.4f" % (module_name, time.time() - t))
loaded_modules.add(mod.__name__) # should match mod.__name__ too
return mod
def modules_from_path(path, loaded_modules):
"""
@ -134,7 +136,8 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
if module_name and module_name != "bpy.types": # hard coded for C types
loaded_modules.add(module_name)
for module_name in loaded_modules:
# sorting isnt needed but rather it be pradictable
for module_name in sorted(loaded_modules):
print("Reloading:", module_name)
test_reload(_sys.modules[module_name])