kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Report to the console when custom ocio config is used

Browse Source
This commit is contained in:
Sergey Sharybin 2014-05-23 13:48:05 +02:00
parent d3a94941ef
commit 56b7d55833
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/opencolorio/fallback_impl.cc
View File

@ -60,7 +60,7 @@ void FallbackImpl::setCurrentConfig(const OCIO_ConstConfigRcPtr * /*config*/)
OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromEnv(void) OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromEnv(void)
{ {
return CONFIG_DEFAULT; return NULL;
} }
OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char * /*filename*/) OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char * /*filename*/)

6
source/blender/imbuf/intern/colormanagement.c
View File

@ -626,8 +626,12 @@ void colormanagement_init(void)
ocio_env = getenv("OCIO"); ocio_env = getenv("OCIO");
if (ocio_env && ocio_env[0] != '\0') if (ocio_env && ocio_env[0] != '\0') {
config = OCIO_configCreateFromEnv(); config = OCIO_configCreateFromEnv();
if (config != NULL) {
printf("Color management: Using %s as a configuration file\n", ocio_env);
}
}
if (config == NULL) { if (config == NULL) {
configdir = BLI_get_folder(BLENDER_DATAFILES, "colormanagement"); configdir = BLI_get_folder(BLENDER_DATAFILES, "colormanagement");