[Bf-blender-cvs] [ff80cbbeeb0] temp-usd-prev-export2: USD material export format fixes.
Michael Kowalski
noreply at git.blender.org
Sat Jan 15 02:22:43 CET 2022
Commit: ff80cbbeeb03cc5865e4e8ff8d0eab19c557ce31
Author: Michael Kowalski
Date: Fri Jan 14 19:55:29 2022 -0500
Branches: temp-usd-prev-export2
https://developer.blender.org/rBff80cbbeeb03cc5865e4e8ff8d0eab19c557ce31
USD material 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 0d28d322c47..c149e0873b2 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -122,9 +122,8 @@ 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);
-template<typename T1, typename T2> void create_input(pxr::UsdShadeShader &shader,
- const InputSpec &spec,
- const void *value);
+template<typename T1, typename T2>
+void create_input(pxr::UsdShadeShader &shader, const InputSpec &spec, const void *value);
void create_usd_preview_surface_material(const USDExporterContext &usd_export_context,
Material *material,
@@ -260,9 +259,8 @@ static InputSpecMap &preview_surface_input_map()
* provided by the InputSpec and assign the given value to the
* input. Parameters T1 and T2 indicate the Blender and USD
* value types, respectively. */
-template<typename T1, typename T2> void create_input(pxr::UsdShadeShader &shader,
- const InputSpec &spec,
- const void *value)
+template<typename T1, typename T2>
+void create_input(pxr::UsdShadeShader &shader, const InputSpec &spec, const void *value)
{
const T1 *cast_value = static_cast<const T1 *>(value);
shader.CreateInput(spec.input_name, spec.input_type).Set(T2(cast_value->value));
@@ -421,7 +419,6 @@ static void get_absolute_path(Image *ima, char *r_path)
BLI_path_normalize(nullptr, r_path);
}
-
static pxr::TfToken get_node_tex_image_color_space(bNode *node)
{
if (!node->id) {
More information about the Bf-blender-cvs
mailing list