[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30440] trunk/blender/source/blender/ blenlib/intern/path_util.c: 2.5: installation paths, local directories ( in the same folder as executable)

[Brecht Van Lommel]

Revision: 30440
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30440
Author:   blendix
Date:     2010-07-17 17:42:01 +0200 (Sat, 17 Jul 2010)

Log Message:
-----------
2.5: installation paths, local directories (in the same folder as executable)
are now considered system rather than user directories, as you would expect
these to override any system directory for local installations.

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-17 14:57:46 UTC (rev 30439)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2010-07-17 15:42:01 UTC (rev 30440)
@@ -953,11 +953,11 @@
 			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;
 			
 		case BLENDER_SYSTEM_DATAFILES:
+			if (get_path_local(path, "datafiles", subfolder)) break;
 			if (get_path_system(path, "datafiles", subfolder, "BLENDER_SYSTEM_DATAFILES"))	break;
 			return NULL;
 			
@@ -973,11 +973,11 @@
 			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;
 			
 		case BLENDER_SYSTEM_CONFIG:
+			if (get_path_local(path, "config", subfolder)) break;
 			if (get_path_system(path, "config", subfolder, "BLENDER_SYSTEM_CONFIG")) break;
 			return NULL;
 			
@@ -988,11 +988,11 @@
 			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;
 			
 		case BLENDER_SYSTEM_SCRIPTS:
+			if (get_path_local(path, "scripts", subfolder)) break;
 			if (get_path_system(path, "scripts", subfolder, "BLENDER_SYSTEM_SCRIPTS")) break;
 			return NULL;
 			
@@ -1002,6 +1002,7 @@
 			return NULL;
 			
 		case BLENDER_SYSTEM_PYTHON:
+			if (get_path_local(path, "python", subfolder)) break;
 			if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON")) break;
 			return NULL;
 	}