[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30565] trunk/blender/source/blender/ blenlib/intern/path_util.c: == installation paths ==

[Andrea Weikert]

Revision: 30565
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30565
Author:   elubie
Date:     2010-07-21 07:49:48 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
== installation paths ==
Hopefully last fix for path issues for this release
* The config folder should also be searched for in the 'local' path for local 
installations
(This code was already there, but removed in revision 30440)

Revision Links:
--------------
    
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30440

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c     2010-07-21 
03:43:38 UTC (rev 30564)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c     2010-07-21 
05:49:48 UTC (rev 30565)
@@ -953,6 +953,7 @@
                        return NULL;
                        
                case BLENDER_USER_DATAFILES:
+                       if (get_path_local(path, "datafiles", subfolder)) break;
                        if (get_path_user(path, "datafiles", subfolder, 
"BLENDER_USER_DATAFILES"))      break;
                        return NULL;
                        
@@ -973,6 +974,7 @@
                        return NULL;
                        
                case BLENDER_USER_CONFIG:
+                       if (get_path_local(path, "config", subfolder)) break;
                        if (get_path_user(path, "config", subfolder, 
"BLENDER_USER_CONFIG")) break;
                        return NULL;
                        
@@ -988,6 +990,7 @@
                        return NULL;
                        
                case BLENDER_USER_SCRIPTS:
+                       if (get_path_local(path, "scripts", subfolder)) break;
                        if (get_path_user(path, "scripts", subfolder, 
"BLENDER_USER_SCRIPTS")) break;
                        return NULL;
                        


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs