- up to 2.83.12

[packages/blender.git] / blender-2.76-droid.patch

diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch
index f485ddc6e5a519a2907a651bca00cad9e2fd1554..2c8b6c8e4c10bb5509a464c12ef8918aff716c76 100644 (file)
--- a/blender-2.76-droid.patch
+++ b/blender-2.76-droid.patch
@@ -1,12 +1,11 @@
-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
---- blender-2.76.orig/source/blender/blenfont/intern/blf_font_i18n.c   2015-10-10 10:20:56.000000000 +0200
-+++ blender-2.76/source/blender/blenfont/intern/blf_font_i18n.c        2015-10-12 16:40:42.225473358 +0200
-@@ -57,7 +57,7 @@
+--- blender-2.83.12/source/blender/blenfont/intern/blf_font_default.c~ 2021-01-15 15:25:53.000000000 +0100
++++ blender-2.83.12/source/blender/blenfont/intern/blf_font_default.c  2021-03-06 19:32:29.170479890 +0100
+@@ -33,7 +33,7 @@
  
- static void fontbuf_load(struct FontBuf *fb)
+ static int blf_load_font_default(const char *filename, const bool unique)
  {
--  const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-+  const char *fontpath = "/usr/share/fonts/blender";
-   if (fontpath) {
-     char unifont_path[1024];
-     BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, fb->filename);
+-  const char *dir = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
++  const char *dir = "/usr/share/fonts/blender";
+   if (dir == NULL) {
+     fprintf(stderr,
+             "%s: 'fonts' data path not found for '%s', will not be able to display text\n",