Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/opencolorio/fallback_impl.cc2
-rw-r--r--source/blender/imbuf/intern/colormanagement.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index c0797cbc37f..d1493cb3ad5 100644
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -60,7 +60,7 @@ void FallbackImpl::setCurrentConfig(const OCIO_ConstConfigRcPtr * /*config*/)
OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromEnv(void)
{
- return CONFIG_DEFAULT;
+ return NULL;
}
OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char * /*filename*/)
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 590b21259c3..21ee8ebe237 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -626,8 +626,12 @@ void colormanagement_init(void)
ocio_env = getenv("OCIO");
- if (ocio_env && ocio_env[0] != '\0')
+ if (ocio_env && ocio_env[0] != '\0') {
config = OCIO_configCreateFromEnv();
+ if (config != NULL) {
+ printf("Color management: Using %s as a configuration file\n", ocio_env);
+ }
+ }
if (config == NULL) {
configdir = BLI_get_folder(BLENDER_DATAFILES, "colormanagement");