[Bf-blender-cvs] [8ea8e9195ee] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 8ea8e9195ee20e99f53088ef7c054d7bc84aa577
Author: Mateusz Grzeliński
Date:   Sun Jul 5 15:59:36 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB8ea8e9195ee20e99f53088ef7c054d7bc84aa577

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/blenkernel/intern/appdir.c
#	source/blender/blenloader/intern/readfile.h

===================================================================



===================================================================

diff --cc source/blender/blenfont/intern/blf_font.c
index c39234fcb5c,50a8223a84c..99652e7d063
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@@ -298,11 -297,10 +298,11 @@@ void blf_font_size(FontBLF *font, unsig
      }
    }
  
-   err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi);
+   err = FT_Set_Char_Size(font->face, 0, ((FT_F26Dot6)(size)) * 64, dpi, dpi);
    if (err) {
 -    /* FIXME: here we can go through the fixed size and choice a close one */
 -    printf("The current font don't support the size, %u and dpi, %u\n", size, dpi);
 +    /* FIXME: here we can go through the fixed size and choose a close one */
 +    CLOG_ERROR(
 +        BLENFONT_LOG, "The current font doesn't support the size, %u and dpi, %u", size, dpi);
  
      blf_glyph_cache_release(font);
      return;
diff --cc source/blender/blenkernel/intern/appdir.c
index c2b94f89b42,58337bcf488..78d512a16ff
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@@ -147,14 -149,17 +147,13 @@@ static bool test_path(char *targetpath
     * if folder_name is specified but not otherwise? */
  
    if (BLI_is_dir(targetpath)) {
 -#ifdef PATH_DEBUG
 -    printf("\t%s found: %s\n", __func__, targetpath);
 -#endif
 +    CLOG_INFO(&LOG, 1, "\tfound: %s", targetpath);
      return true;
    }
-   else {
-     CLOG_INFO(&LOG, 1, "\tmissing: %s", targetpath);
-     // targetpath[0] = '\0';
-     return false;
-   }
+ 
 -#ifdef PATH_DEBUG
 -  printf("\t%s missing: %s\n", __func__, targetpath);
 -#endif
++  CLOG_INFO(&LOG, 1, "\tmissing: %s", targetpath);
+   // targetpath[0] = '\0';
+   return false;
  }
  
  /**
@@@ -170,14 -175,17 +169,13 @@@ static bool test_env_path(char *path, c
  
    if (BLI_is_dir(env)) {
      BLI_strncpy(path, env, FILE_MAX);
 -#ifdef PATH_DEBUG
 -    printf("\t%s env %s found: %s\n", __func__, envvar, env);
 -#endif
 +    CLOG_INFO(&LOG, 1, "\tenv %s found: %s", envvar, env);
      return true;
    }
-   else {
-     path[0] = '\0';
-     CLOG_INFO(&LOG, 1, "\tenv %s missing: %s", envvar, env);
-     return false;
-   }
+ 
+   path[0] = '\0';
 -#ifdef PATH_DEBUG
 -  printf("\t%s env %s missing: %s\n", __func__, envvar, env);
 -#endif
++  CLOG_INFO(&LOG, 1, "\tenv %s missing: %s", envvar, env);
+   return false;
  }
  
  /**
diff --cc source/blender/blenloader/intern/readfile.h
index 10b9a3c372d,57c86f7128c..31a38a12fab
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@@ -30,8 -30,7 +30,9 @@@
  #include "DNA_windowmanager_types.h" /* for ReportType */
  #include "zlib.h"
  
 +extern struct CLG_LogRef *BLENLOADER_LOG_VERSIONING;
 +
+ struct BLOCacheStorage;
  struct GSet;
  struct IDNameLib_Map;
  struct Key;