fix for error printing class register error, remove an unneeded check.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 21 Mar 2011 22:17:01 +0000 (22:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 21 Mar 2011 22:17:01 +0000 (22:17 +0000)
release/scripts/modules/bpy/utils.py

index 8f1fdc284023b539d4859b6d94e7958717c197b0..f4f7d0652594f08ae112c0a17f704e262fff2ccd 100644 (file)
@@ -182,8 +182,6 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
 
         _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 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
                 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 @@ def register_module(module, verbose=False):
                 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 @@ def unregister_module(module, verbose=False):
                 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: