From c1095c7a9f1c96a5bb249bed8e465e653a54a4dc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 23 Mar 2016 19:25:29 +0100 Subject: Revert "Fix T47869: OpenColorIO Error with unicode path to config file under Windows" White the config itself could be loaded this way, lookup tables can not. Additionally, that's not really clear how to solve the issue with search path which is multi-byte only in the API. Reverting for further investigation. This reverts commit ab4307aa0868f2d8389cc0dd500eff38909b08f1. --- source/blender/imbuf/intern/colormanagement.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index e38367414fd..e4e93d3c4da 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -635,7 +635,18 @@ void colormanagement_init(void) if (configdir) { BLI_join_dirfile(configfile, sizeof(configfile), configdir, BCM_CONFIG_FILE); + +#ifdef WIN32 + { + /* quite a hack to support loading configuration from path with non-acii symbols */ + + char short_name[256]; + BLI_get_short_name(short_name, configfile); + config = OCIO_configCreateFromFile(short_name); + } +#else config = OCIO_configCreateFromFile(configfile); +#endif } } -- cgit v1.2.3