[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30414] branches/render25/source/blender/ blenlib/intern/path_util.c: Render Branch: quick fix for path problems, using local scripts as

[Brecht Van Lommel]

Revision: 30414
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30414
Author:   blendix
Date:     2010-07-16 17:46:37 +0200 (Fri, 16 Jul 2010)

Log Message:
-----------
Render Branch: quick fix for path problems, using local scripts as
system rather than user scripts, will discuss doing the same in trunk
later.

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

Modified: branches/render25/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/path_util.c	2010-07-16 15:45:35 UTC (rev 30413)
+++ branches/render25/source/blender/blenlib/intern/path_util.c	2010-07-16 15:46:37 UTC (rev 30414)
@@ -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;
 			
@@ -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;
 	}