== installation paths ==
authorAndrea Weikert <elubie@gmx.net>
Wed, 21 Jul 2010 05:49:48 +0000 (05:49 +0000)
committerAndrea Weikert <elubie@gmx.net>
Wed, 21 Jul 2010 05:49:48 +0000 (05:49 +0000)
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)

source/blender/blenlib/intern/path_util.c

index 470676cb461ede60c0970a60c85220d979763abc..d3e2b8f83e5c9dd9977acaeed49687cfa770f627 100644 (file)
@@ -953,6 +953,7 @@ char *BLI_get_folder(int folder_id, char *subfolder)
                        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 @@ char *BLI_get_folder(int folder_id, char *subfolder)
                        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 @@ char *BLI_get_folder(int folder_id, char *subfolder)
                        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;