Commit: 08553b4c9f6edcfe36ae8b888e62995b74ef2eb8 Author: Michael Kowalski Date: Sun Dec 26 21:53:50 2021 -0500 Branches: temp-usd-prev-export2 https://developer.blender.org/rB08553b4c9f6edcfe36ae8b888e62995b74ef2eb8
USD Preview Surface export cleanup. Now calling standard BLI_path_slash_native() in the path comparison function. =================================================================== M source/blender/io/usd/intern/usd_writer_material.cc =================================================================== diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc index a011559dfe0..a7ca14c6d73 100644 --- a/source/blender/io/usd/intern/usd_writer_material.cc +++ b/source/blender/io/usd/intern/usd_writer_material.cc @@ -369,15 +369,8 @@ static bool paths_equal(const char *p1, const char *p2) BLI_strncpy(norm_p1, p1, sizeof(norm_p1)); BLI_strncpy(norm_p2, p2, sizeof(norm_p2)); -#ifdef WIN32 - /* On Windows, BLI_path_normalize() expects - * backslash separators, so we caonvert all - * forward slashes to backslashes. - * TODO(makowalski): consider alternatives to - * avoid this. */ - BLI_str_replace_char(norm_p1, '/', '\\'); - BLI_str_replace_char(norm_p2, '/', '\\'); -#endif + BLI_path_slash_native(norm_p1); + BLI_path_slash_native(norm_p2); BLI_path_normalize(nullptr, norm_p1); BLI_path_normalize(nullptr, norm_p2); _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
