[Bf-blender-cvs] [56b7d55] master: Report to the console when custom ocio config is used

[Sergey Sharybin]

Commit: 56b7d558336a328dec76d180b6fff55a80b93903
Author: Sergey Sharybin
Date:   Fri May 23 13:48:05 2014 +0200
https://developer.blender.org/rB56b7d558336a328dec76d180b6fff55a80b93903

Report to the console when custom ocio config is used

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

M	intern/opencolorio/fallback_impl.cc
M	source/blender/imbuf/intern/colormanagement.c

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

diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index c0797cb..d1493cb 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 590b212..21ee8eb 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");