[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38084] trunk/blender/source/blender/ blenlib/intern/path_util.c: Paths: remove some temporary code that was only needed for 2.57.

[Brecht Van Lommel]

Revision: 38084
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38084
Author:   blendix
Date:     2011-07-04 13:33:47 +0000 (Mon, 04 Jul 2011)
Log Message:
-----------
Paths: remove some temporary code that was only needed for 2.57.

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	2011-07-04 13:03:41 UTC (rev 38083)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-07-04 13:33:47 UTC (rev 38084)
@@ -1024,26 +1024,6 @@
 	}
 }
 
-#if defined(WIN32) && BLENDER_VERSION < 258
-
-static int path_have_257_script_install(void)
-{
-	const int ver= BLENDER_VERSION;
-	char path[FILE_MAX] = "";
-	char system_pyfile[FILE_MAX];
-
-	if (get_path_user(path, "scripts", NULL, "BLENDER_USER_SCRIPTS", ver)) {
-		BLI_join_dirfile(system_pyfile, sizeof(system_pyfile), path, "modules/bpy_types.py");
-
-		if (BLI_exists(system_pyfile))
-			return 1;
-	}
-
-	return 0;
-}
-
-#endif
-
 /* get a folder out of the 'folder_id' presets for paths */
 /* returns the path if found, NULL string if not */
 char *BLI_get_folder(int folder_id, const char *subfolder)
@@ -1076,20 +1056,7 @@
 			return NULL;
 			
 		case BLENDER_USER_SCRIPTS:
-#if defined(WIN32) && BLENDER_VERSION < 258
-			/* if we have a 2.57 installation, then we may have system script
-			 * files in the user configuration folder. avoid using that folder
-			 * if they are there, until the version gets bumped to 2.58, so
-			 * we can be sure that folder only has addons etc. */
-			if (path_have_257_script_install()) {
-				if (get_path_local(path, "scripts", subfolder, ver)) break;
-			}
-			else
-#endif
-			{
-				if (get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver)) break;
-			}
-
+			if (get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver)) break;
 			return NULL;
 			
 		case BLENDER_SYSTEM_SCRIPTS: