diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-23 21:25:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-23 21:28:16 +0300 |
| commit | c1095c7a9f1c96a5bb249bed8e465e653a54a4dc (patch) | |
| tree | 33dad2cf404d65fa757720a0acf5e4cb9b18abe9 /source/blender/imbuf/intern/colormanagement.c | |
| parent | 376eb77fd7c97cbec27b824dc751a318e526a9eb (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf/intern/colormanagement.c')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 } } |