Commit: ecbac7068300d6833c83c4c376739de53ec988e0
Author: Michael Kowalski
Date: Mon Dec 27 14:49:16 2021 -0500
Branches: temp-usd-prev-export2
https://developer.blender.org/rBecbac7068300d6833c83c4c376739de53ec988e0
USD export: skip texture copy for equal paths.
Skip texture copy when the source and destination paths
are equivalent.
===================================================================
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 a80a6bbe99f..719ae431c9a 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -487,7 +487,7 @@ static void copy_tiled_textures(Image *ima,
std::string src_tile_path = std::string(src_dir) + std::string(tile_file);
- if (allow_overwrite && paths_equal(src_tile_path.c_str(),
dest_tile_path.c_str())) {
+ if (paths_equal(src_tile_path.c_str(), dest_tile_path.c_str())) {
/* Source and destination paths are the same, don't copy. */
continue;
}
@@ -530,7 +530,7 @@ static void copy_single_file(Image *ima, const std::string
&dest_dir, const bool
return;
}
- if (allow_overwrite && paths_equal(source_path, dest_path.c_str())) {
+ if (paths_equal(source_path, dest_path.c_str())) {
/* Source and destination paths are the same, don't copy. */
return;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
