diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:34:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:34:31 +0300 |
| commit | 1e35f4da7268b76b12a2a23452d0a632a8d790a7 (patch) | |
| tree | b3ba68e17ade96f90986de14d1221026f564384d /source/blender/imbuf | |
| parent | af7d0af153a35796b6eb7cde3fc417025919495d (diff) | |
| parent | c13b2a2504393371e32a4fb4c01cfad8d7cc929e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 86c0dd69930..1d287025a4e 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -624,7 +624,7 @@ void colormanagement_init(void) OCIO_init(); - ocio_env = getenv("OCIO"); + ocio_env = BLI_getenv("OCIO"); if (ocio_env && ocio_env[0] != '\0') { config = OCIO_configCreateFromEnv(); diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 674f9c0f166..fbc34264b30 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -99,10 +99,10 @@ static bool get_thumb_dir(char *dir, ThumbSize size) s += strlen(dir); #else #if defined(USE_FREEDESKTOP) - const char *home_cache = getenv("XDG_CACHE_HOME"); - const char *home = home_cache ? home_cache : getenv("HOME"); + const char *home_cache = BLI_getenv("XDG_CACHE_HOME"); + const char *home = home_cache ? home_cache : BLI_getenv("HOME"); #else - const char *home = getenv("HOME"); + const char *home = BLI_getenv("HOME"); #endif if (!home) return 0; s += BLI_strncpy_rlen(s, home, FILE_MAX); |