diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-28 01:04:17 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-28 01:04:17 +0300 |
| commit | b6ac95145cf616a36e58c846e7fccbf7ccc69faa (patch) | |
| tree | 916ec4c6900dbe1709002dcb41c2ceebdf983b67 /source/blender/io/usd/intern/usd_writer_abstract.h | |
| parent | 79c90bd49fafd050883161798a45427d60ffd0ed (diff) | |
| parent | da848b7440ab8878b350f764dfbf70729e43021d (diff) | |
Merge branch 'master' into temp-gpu-image-enginetemp-gpu-image-engine
Diffstat (limited to 'source/blender/io/usd/intern/usd_writer_abstract.h')
| -rw-r--r-- | source/blender/io/usd/intern/usd_writer_abstract.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index dd81dd47c83..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); + pxr::UsdShadeMaterial ensure_usd_material(const HierarchyContext &context, Material *material); void write_visibility(const HierarchyContext &context, const pxr::UsdTimeCode timecode, |