diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-23 15:48:05 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-23 15:48:35 +0400 |
| commit | 56b7d558336a328dec76d180b6fff55a80b93903 (patch) | |
| tree | c6c0f2b48dde198e9b9b5aec08e2e5d2a34eba49 | |
| parent | d3a94941effd7bffd16569795484e9415a3db764 (diff) | |
Report to the console when custom ocio config is used
| -rw-r--r-- | intern/opencolorio/fallback_impl.cc | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 6 |
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"); |