Commit: 2156f238b0da6dc2c2347a5b98b44ee2888bae35
Author: Michael Kowalski
Date: Sun Dec 26 15:20:08 2021 -0500
Branches: temp-usd-prev-export2
https://developer.blender.org/rB2156f238b0da6dc2c2347a5b98b44ee2888bae35
USD Preview Surface export code cleanup.
Following convention to make context the first
parameter.
===================================================================
M source/blender/io/usd/intern/usd_writer_abstract.cc
M source/blender/io/usd/intern/usd_writer_abstract.h
M source/blender/io/usd/intern/usd_writer_mesh.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc
b/source/blender/io/usd/intern/usd_writer_abstract.cc
index 6ec9d835c89..470718b49c8 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.cc
+++ b/source/blender/io/usd/intern/usd_writer_abstract.cc
@@ -123,8 +123,8 @@ const pxr::SdfPath &USDAbstractWriter::usd_path() const
return usd_export_context_.usd_path;
}
-pxr::UsdShadeMaterial USDAbstractWriter::ensure_usd_material(Material
*material,
- const
HierarchyContext &context)
+pxr::UsdShadeMaterial USDAbstractWriter::ensure_usd_material(const
HierarchyContext &context,
+ Material
*material)
{
static pxr::SdfPath material_library_path("/_materials");
pxr::UsdStageRefPtr stage = usd_export_context_.stage;
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h
b/source/blender/io/usd/intern/usd_writer_abstract.h
index 31a126d5a79..c67aa824263 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.h
+++ b/source/blender/io/usd/intern/usd_writer_abstract.h
@@ -69,7 +69,7 @@ class USDAbstractWriter : public AbstractHierarchyWriter {
virtual void do_write(HierarchyContext &context) = 0;
pxr::UsdTimeCode get_export_time_code() const;
- pxr::UsdShadeMaterial ensure_usd_material(Material *material, const
HierarchyContext &context);
+ pxr::UsdShadeMaterial ensure_usd_material(const HierarchyContext &context,
Material *material);
void write_visibility(const HierarchyContext &context,
const pxr::UsdTimeCode timecode,
diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc
b/source/blender/io/usd/intern/usd_writer_mesh.cc
index d7eeb8a243c..f3f50367f4b 100644
--- a/source/blender/io/usd/intern/usd_writer_mesh.cc
+++ b/source/blender/io/usd/intern/usd_writer_mesh.cc
@@ -319,7 +319,7 @@ void USDGenericMeshWriter::assign_materials(const
HierarchyContext &context,
continue;
}
- pxr::UsdShadeMaterial usd_material = ensure_usd_material(material,
context);
+ pxr::UsdShadeMaterial usd_material = ensure_usd_material(context,
material);
material_binding_api.Bind(usd_material);
/* USD seems to support neither per-material nor per-face-group
double-sidedness, so we just
@@ -353,7 +353,7 @@ void USDGenericMeshWriter::assign_materials(const
HierarchyContext &context,
continue;
}
- pxr::UsdShadeMaterial usd_material = ensure_usd_material(material,
context);
+ pxr::UsdShadeMaterial usd_material = ensure_usd_material(context,
material);
pxr::TfToken material_name = usd_material.GetPath().GetNameToken();
pxr::UsdGeomSubset usd_face_subset =
material_binding_api.CreateMaterialBindSubset(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
