pviktori / rpms / blender

Forked from rpms/blender 5 years ago
Clone
ba5af30
diff -uNr blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c blender-2.78c/source/blender/blenfont/intern/blf_font_i18n.c
ba5af30
--- blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c	2017-02-13 06:08:03.000000000 -0800
ba5af30
+++ blender-2.78c/source/blender/blenfont/intern/blf_font_i18n.c	2017-03-11 21:25:50.361053885 -0800
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");
536efdc
+		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");
536efdc
+		const char * const fontpath = "/usr/share/fonts/blender";
Jochen Schmitt 0d88b50
 		if (fontpath) {
Jochen Schmitt 0d88b50
 			char unifont_path[1024];
Jochen Schmitt 0d88b50
 
ba5af30
diff -uNr blender-2.78c.orig/source/creator/CMakeLists.txt blender-2.78c/source/creator/CMakeLists.txt
ba5af30
--- blender-2.78c.orig/source/creator/CMakeLists.txt	2017-02-24 06:09:19.000000000 -0800
ba5af30
+++ blender-2.78c/source/creator/CMakeLists.txt	2017-03-13 10:59:14.815315973 -0700
ba5af30
@@ -370,9 +370,8 @@
ba5af30
 # localization
ba5af30
 if(WITH_INTERNATIONAL)
7cb8934
 	install(
ba5af30
-		DIRECTORY
ba5af30
-			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
7cb8934
-		DESTINATION ${TARGETDIR_VER}/datafiles
536efdc
+		DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/
7cb8934
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
7cb8934
 	)
7cb8934
 
7cb8934
 	set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")