[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26955] trunk/blender/release/scripts/ modules/bpy/utils.py: ignore scripts that are loaded twice rather then raising an error.
Campbell Barton
ideasman42 at gmail.com
Tue Feb 16 14:13:23 CET 2010
Revision: 26955
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26955
Author: campbellbarton
Date: 2010-02-16 14:13:22 +0100 (Tue, 16 Feb 2010)
Log Message:
-----------
ignore scripts that are loaded twice rather then raising an error.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/utils.py
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2010-02-16 13:09:03 UTC (rev 26954)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2010-02-16 13:13:22 UTC (rev 26955)
@@ -39,16 +39,18 @@
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 @@
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])
More information about the Bf-blender-cvs
mailing list