[Bf-blender-cvs] [a5f22596c13] temp-usd-prev-export2: USD Preview Surface export format fixes.
Michael Kowalski
noreply at git.blender.org
Tue Dec 28 06:13:53 CET 2021
Commit: a5f22596c13f8abb258d5af21c30040672637eb5
Author: Michael Kowalski
Date: Tue Dec 28 00:10:59 2021 -0500
Branches: temp-usd-prev-export2
https://developer.blender.org/rBa5f22596c13f8abb258d5af21c30040672637eb5
USD Preview Surface export format fixes.
===================================================================
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 417d497c8ac..99a05ab67c6 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -122,7 +122,6 @@ static std::string get_tex_image_asset_path(bNode *node,
static InputSpecMap &preview_surface_input_map();
static bNode *traverse_channel(bNodeSocket *input, short target_type);
-
void create_usd_preview_surface_material(const USDExporterContext &usd_export_context,
Material *material,
pxr::UsdShadeMaterial &usd_material,
@@ -416,8 +415,7 @@ static void export_in_memory_texture(Image *ima,
std::cout << "Exporting in-memory texture to " << export_path << std::endl;
if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) == 0) {
- WM_reportf(
- RPT_WARNING, "USD export: couldn't export in-memory texture to %s", export_path);
+ WM_reportf(RPT_WARNING, "USD export: couldn't export in-memory texture to %s", export_path);
}
}
@@ -520,10 +518,8 @@ static void copy_single_file(Image *ima, const std::string &dest_dir, const bool
/* Copy the file. */
if (BLI_copy(source_path, dest_path) != 0) {
- WM_reportf(RPT_WARNING,
- "USD export: couldn't copy texture from %s to %s",
- source_path,
- dest_path);
+ WM_reportf(
+ RPT_WARNING, "USD export: couldn't copy texture from %s to %s", source_path, dest_path);
}
}
More information about the Bf-blender-cvs
mailing list