pviktori / rpms / blender

Forked from rpms/blender 5 years ago
Clone
00ebb6d
diff -uNr blender-2.76.orig/source/blender/blenfont/intern/blf_font_i18n.c blender-2.76/source/blender/blenfont/intern/blf_font_i18n.c
00ebb6d
--- blender-2.76.orig/source/blender/blenfont/intern/blf_font_i18n.c	2015-10-10 10:20:56.000000000 +0200
00ebb6d
+++ blender-2.76/source/blender/blenfont/intern/blf_font_i18n.c	2015-10-12 16:40:42.225473358 +0200
00ebb6d
@@ -57,7 +57,7 @@
Jochen Schmitt 0d88b50
 {
Jochen Schmitt 0d88b50
 #ifdef WITH_INTERNATIONAL
Jochen Schmitt 0d88b50
 	if (unifont_ttf == NULL) {
Jochen Schmitt 0d88b50
-		const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
00ebb6d
+		const char * const fontpath = "/usr/share/fonts/blender";
Jochen Schmitt 0d88b50
 		if (fontpath) {
Jochen Schmitt 0d88b50
 			char unifont_path[1024];
Jochen Schmitt 0d88b50
 
00ebb6d
@@ -92,7 +92,7 @@
Jochen Schmitt 0d88b50
 {
Jochen Schmitt 0d88b50
 #ifdef WITH_INTERNATIONAL
Jochen Schmitt 0d88b50
 	if (unifont_mono_ttf == NULL) {
Jochen Schmitt 0d88b50
-		const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
Jochen Schmitt 0d88b50
+		const char *fontpath = "/usr/share/fonts/blender";
Jochen Schmitt 0d88b50
 		if (fontpath) {
Jochen Schmitt 0d88b50
 			char unifont_path[1024];
Jochen Schmitt 0d88b50
 
7cb8934
diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt
7cb8934
--- blender-2.78a.old/source/creator/CMakeLists.txt	2016-11-04 15:25:41.885950647 +0100
7cb8934
+++ blender-2.78a/source/creator/CMakeLists.txt	2017-01-29 21:38:17.938835287 +0100
7cb8934
@@ -372,7 +372,7 @@
7cb8934
 	install(
7cb8934
 		DIRECTORY
7cb8934
 			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
7cb8934
-		DESTINATION ${TARGETDIR_VER}/datafiles
7cb8934
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
7cb8934
 	)
7cb8934
 
7cb8934
 	set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")