[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30208] trunk/blender/source/blender/ blenlib: == installation paths ==

Andrea Weikert elubie at gmx.net
Sun Jul 11 18:28:29 CEST 2010


Revision: 30208
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30208
Author:   elubie
Date:     2010-07-11 18:28:28 +0200 (Sun, 11 Jul 2010)

Log Message:
-----------
== installation paths ==
separate define for the user and system blender directory name,
on Linux the directories should be named /usr/share/blender and ~/.blender.

Platform maintainers should still check if that's ok.

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

Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h	2010-07-11 16:12:32 UTC (rev 30207)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h	2010-07-11 16:28:28 UTC (rev 30208)
@@ -101,11 +101,14 @@
 #define BLENDER_HISTORY_FILE	"recent-files.txt"
 
 #ifdef WIN32
-#define BLENDER_BASE_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
+#define BLENDER_USER_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
+#define BLENDER_SYSTEM_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
 #elif __APPLE__
-#define BLENDER_BASE_FORMAT			"%s/Blender/%s"
+#define BLENDER_USER_FORMAT			"%s/Blender/%s"
+#define BLENDER_SYSTEM_FORMAT			"%s/Blender/%s"
 #else
-#define BLENDER_BASE_FORMAT			"%s/.blender/%s"
+#define BLENDER_USER_FORMAT			"%s/.blender/%s"
+#define BLENDER_SYSTEM_FORMAT			"%s/blender/%s"
 #endif
 
 void BLI_setenv(const char *env, const char *val);

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2010-07-11 16:12:32 UTC (rev 30207)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2010-07-11 16:28:28 UTC (rev 30208)
@@ -1014,7 +1014,7 @@
 	
 	user_base_path = (const char *)GHOST_getUserDir();
 	if (user_base_path) {
-		BLI_snprintf(user_path, FILE_MAX, BLENDER_BASE_FORMAT, user_base_path, blender_version_decimal());
+		BLI_snprintf(user_path, FILE_MAX, BLENDER_USER_FORMAT, user_base_path, blender_version_decimal());
 	}
 
 	if(!user_path[0])
@@ -1040,7 +1040,7 @@
 
 	system_base_path = (const char *)GHOST_getSystemDir();
 	if (system_base_path) {
-		BLI_snprintf(system_path, FILE_MAX, BLENDER_BASE_FORMAT, system_base_path, blender_version_decimal());
+		BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path, blender_version_decimal());
 	}
 	
 	if(!system_path[0])





More information about the Bf-blender-cvs mailing list