diff -up blender-2.60/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.60/source/blender/blenfont/intern/blf_lang.c
--- blender-2.60/source/blender/blenfont/intern/blf_lang.c.syspath 2011-10-19 17:02:14.000000000 +0200
+++ blender-2.60/source/blender/blenfont/intern/blf_lang.c 2011-10-19 19:55:35.713250764 +0200
@@ -99,15 +99,15 @@ static const char *locales[] = {
void BLF_lang_init(void)
{
- char *messagepath= BLI_get_folder(BLENDER_DATAFILES, "locale");
-
+ // char *messagepath= BLI_get_folder(BLENDER_DATAFILES, "locale");
+ char *messagepath = "/usr/share/locale";
+
BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name));
if (messagepath)
BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath));
else
global_messagepath[0]= '\0';
-
}
/* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */
diff -up blender-2.60/source/blender/blenlib/intern/path_util.c.syspath blender-2.60/source/blender/blenlib/intern/path_util.c
--- blender-2.60/source/blender/blenlib/intern/path_util.c.syspath 2011-10-19 17:02:11.000000000 +0200
+++ blender-2.60/source/blender/blenlib/intern/path_util.c 2011-10-19 20:04:44.681217452 +0200
@@ -958,41 +958,6 @@ static int get_path_system(char *targetp
char system_path[FILE_MAX];
const char *system_base_path;
-
- /* first allow developer only overrides to the system path
- * these are only used when running blender from source */
- char cwd[FILE_MAX];
- char relfolder[FILE_MAX];
- char bprogdir[FILE_MAX];
-
- /* use argv[0] (bprogname) to get the path to the executable */
- BLI_split_dirfile(bprogname, bprogdir, NULL, sizeof(bprogdir), 0);
-
- if(folder_name) {
- if (subfolder_name) {
- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
- } else {
- BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
- }
- }
- else {
- relfolder[0]= '\0';
- }
-
- /* try CWD/release/folder_name */
- if(BLI_getwdN(cwd, sizeof(cwd))) {
- if(test_path(targetpath, cwd, "release", relfolder)) {
- return 1;
- }
- }
-
- /* try EXECUTABLE_DIR/release/folder_name */
- if(test_path(targetpath, bprogdir, "release", relfolder))
- return 1;
- /* end developer overrides */
-
-
-
system_path[0] = '\0';
if (test_env_path(system_path, envvar)) {