From 90a7e626b714acc8ed7d863aeb94e7f89a733498 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Apr 28 2012 18:44:53 +0000 Subject: Add forgotten file --- diff --git a/blender-2.63-syspath.patch b/blender-2.63-syspath.patch new file mode 100644 index 0000000..e3920dd --- /dev/null +++ b/blender-2.63-syspath.patch @@ -0,0 +1,64 @@ +diff -up blender-2.63/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.63/source/blender/blenfont/intern/blf_lang.c +--- blender-2.63/source/blender/blenfont/intern/blf_lang.c.syspath 2012-04-26 22:51:30.000000000 +0200 ++++ blender-2.63/source/blender/blenfont/intern/blf_lang.c 2012-04-27 22:47:56.812999801 +0200 +@@ -110,17 +110,7 @@ static const char *locales[] = { + + void BLF_lang_init(void) + { +- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); +- +- BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); +- +- if (messagepath) { +- BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); +- } +- else { +- printf("%s: 'locale' data path for translations not found, continuing\n", __func__); +- global_messagepath[0] = '\0'; +- } ++ *global_messagepath = "/usr/share/locale/"; + + } + +diff -up blender-2.63/source/blender/blenlib/intern/path_util.c.syspath blender-2.63/source/blender/blenlib/intern/path_util.c +--- blender-2.63/source/blender/blenlib/intern/path_util.c.syspath 2012-04-26 22:51:28.000000000 +0200 ++++ blender-2.63/source/blender/blenlib/intern/path_util.c 2012-04-27 23:00:51.268999825 +0200 +@@ -994,38 +994,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]; +- +- 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_current_working_dir(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)) {