diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index f5be1865678..25ee2b00981 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -616,6 +616,12 @@ static void colormanage_free_config() void colormanagement_init() { + /* Handle Blender specific override. */ + const char *blender_ocio_env = BLI_getenv("BLENDER_OCIO"); + if (blender_ocio_env) { + BLI_setenv("OCIO", blender_ocio_env); + } + /* First try config from environment variable. */ const char *ocio_env = BLI_getenv("OCIO"); diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 0dc4aaa4e63..ce01cb2f3fb 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -883,7 +883,9 @@ static void print_help(bArgs *ba, bool all) " $BLENDER_CUSTOM_SPLASH_BANNER Full path to an image to overlay on the splash screen.\n"); if (defs.with_opencolorio) { - PRINT(" $OCIO Path to override the OpenColorIO configuration file.\n"); + PRINT( + " $BLENDER_OCIO Path to override the OpenColorIO configuration file.\n" + " If not set, the $OCIO environment variable is used.\n"); } if (defs.win32 || all) { PRINT(" $TEMP Store temporary files here (MS-Windows).\n");