griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build: USD: Small fix to allow compiling against both 23.11 and 24.05

Browse Source 
The API in question was modified as part of [1] several months ago. The
example scene in the PR now displays correctly with both USD versions.

[1] 7469ddd8bd

Pull Request: https://projects.blender.org/blender/blender/pulls/121636
This commit is contained in:
Charles Wardlaw
2024-05-13 03:02:31 +02:00
committed by Jesse Yurkovich
parent 12bf5ff7d4
commit 2db96ee8ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/io/usd/hydra/instancer.cc
View File

@@ -52,7 +52,7 @@ void InstancerData::update() {}
pxr::VtValue InstancerData::get_data(pxr::TfToken const &key) const
{
ID_LOG(3, "%s", key.GetText());
if (key == pxr::HdInstancerTokens->instanceTransform) {
if (key == pxr::HdInstancerTokens->instanceTransforms) {
return pxr::VtValue(mesh_transforms_);
}
return pxr::VtValue();
@@ -75,7 +75,7 @@ pxr::HdPrimvarDescriptorVector InstancerData::primvar_descriptors(
pxr::HdPrimvarDescriptorVector primvars;
if (interpolation == pxr::HdInterpolationInstance) {
primvars.emplace_back(
pxr::HdInstancerTokens->instanceTransform, interpolation, pxr::HdPrimvarRoleTokens->none);
pxr::HdInstancerTokens->instanceTransforms, interpolation, pxr::HdPrimvarRoleTokens->none);
}
return primvars;
}