[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35674] trunk/blender/release/scripts/ modules/bpy/utils.py: fix for error printing class register error, remove an unneeded check.

Campbell Barton ideasman42 at gmail.com
Mon Mar 21 23:17:01 CET 2011


Revision: 35674
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35674
Author:   campbellbarton
Date:     2011-03-21 22:17:01 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
fix for error printing class register error, remove an unneeded check.

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	2011-03-21 22:10:24 UTC (rev 35673)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2011-03-21 22:17:01 UTC (rev 35674)
@@ -182,8 +182,6 @@
 
         _global_loaded_modules[:] = []
 
-    user_path = user_script_path()
-
     for base_path in script_paths():
         for path_subdir in ("startup", "modules"):
             path = _os.path.join(base_path, path_subdir)
@@ -194,9 +192,6 @@
                 if path_subdir == "modules":
                     continue
 
-                if user_path != base_path and path_subdir == "":
-                    continue  # avoid loading 2.4x scripts
-
                 for mod in modules_from_path(path, loaded_modules):
                     test_register(mod)
 
@@ -441,7 +436,6 @@
                 cls_func()
         except:
             print("bpy.utils.register_module(): failed to registering class %r" % cls)
-            print("\t", path, "line", line)
             import traceback
             traceback.print_exc()
     if verbose:
@@ -463,7 +457,6 @@
                 cls_func()
         except:
             print("bpy.utils.unregister_module(): failed to unregistering class %r" % cls)
-            print("\t", path, "line", line)
             import traceback
             traceback.print_exc()
     if verbose:




More information about the Bf-blender-cvs mailing list