[Bf-blender-cvs] [b6c74b4c6f6] master: Fix T82081: Remove workaround for OCIO Unicode issue on Windows

Jesse Yurkovich noreply at git.blender.org
Fri Jan 6 05:46:05 CET 2023


Commit: b6c74b4c6f6b2b1ec28ec9db091a2a0f4fe66b94
Author: Jesse Yurkovich
Date:   Thu Jan 5 20:44:24 2023 -0800
Branches: master
https://developer.blender.org/rBb6c74b4c6f6b2b1ec28ec9db091a2a0f4fe66b94

Fix T82081: Remove workaround for OCIO Unicode issue on Windows

This workaround is no longer needed and prevents our OCIO configuration
from being loaded if Blender is unpacked under a Unicode path.

Differential Revision: https://developer.blender.org/D16818

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

M	source/blender/imbuf/intern/colormanagement.c

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

diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 0678c224e6b..9f14ca0d596 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -671,17 +671,7 @@ void colormanagement_init(void)
     if (configdir) {
       BLI_path_join(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
     }
   }



More information about the Bf-blender-cvs mailing list