[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4119] contrib/py/scripts/addons/ online_mat_lib/__init__.py: Re-added support for 2. 63 to the online_mat_lib addon.

Peter Cassetta peter at fingertipsoft.com
Wed Jan 2 11:15:21 CET 2013


Revision: 4119
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4119
Author:   petercassetta
Date:     2013-01-02 10:15:15 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Re-added support for 2.63 to the online_mat_lib addon.

Modified Paths:
--------------
    contrib/py/scripts/addons/online_mat_lib/__init__.py

Modified: contrib/py/scripts/addons/online_mat_lib/__init__.py
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/__init__.py	2013-01-01 20:22:49 UTC (rev 4118)
+++ contrib/py/scripts/addons/online_mat_lib/__init__.py	2013-01-02 10:15:15 UTC (rev 4119)
@@ -63,18 +63,33 @@
 
 def findLibrary():
     global mat_lib_folder
-    if os.path.exists(os.path.join(str(bpy.utils.script_path_pref()), "addons", "online_mat_lib", "material-library")):
-        mat_lib_folder = os.path.join(str(bpy.utils.script_path_pref()), "addons", "online_mat_lib", "material-library")
-    elif os.path.exists(os.path.join(bpy.utils.script_path_user(), "addons", "online_mat_lib", "material-library")):
-        mat_lib_folder = os.path.join(bpy.utils.script_path_user(), "addons", "online_mat_lib", "material-library")
-    elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")):
-        mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")
-    elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")):
-        mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")
+    
+    if bpy.app.version[0] + (bpy.app.version[1] / 100.0) < 2.64:
+        if len(bpy.utils.script_paths()) > 2 and os.path.exists(os.path.join(str(bpy.utils.script_paths()[2]), "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(str(bpy.utils.script_paths()[2]), "addons", "online_mat_lib", "material-library")
+        elif len(bpy.utils.script_paths()) > 1 and os.path.exists(os.path.join(bpy.utils.script_paths()[1], "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_paths()[1], "addons", "online_mat_lib", "material-library")
+        elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")
+        elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")
+        else:
+            print("ONLINE MATERIAL LIBRARY -- MAJOR PROBLEM:"\
+            "COULD NOT LOCATE ADD-ON INSTALLATION PATH.")
+            mat_lib_folder = "error"
     else:
-        print("ONLINE MATERIAL LIBRARY -- MAJOR PROBLEM:"\
-        "COULD NOT LOCATE ADD-ON INSTALLATION PATH.")
-        mat_lib_folder = "error"
+        if os.path.exists(os.path.join(str(bpy.utils.script_path_pref()), "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(str(bpy.utils.script_path_pref()), "addons", "online_mat_lib", "material-library")
+        elif os.path.exists(os.path.join(bpy.utils.script_path_user(), "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_path_user(), "addons", "online_mat_lib", "material-library")
+        elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons", "online_mat_lib", "material-library")
+        elif os.path.exists(os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")):
+            mat_lib_folder = os.path.join(bpy.utils.script_paths()[0], "addons_contrib", "online_mat_lib", "material-library")
+        else:
+            print("ONLINE MATERIAL LIBRARY -- MAJOR PROBLEM:"\
+            "COULD NOT LOCATE ADD-ON INSTALLATION PATH.")
+            mat_lib_folder = "error"
 
 findLibrary()
 



More information about the Bf-extensions-cvs mailing list