BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Export volumes from object modifier (quick effect) #62

Merged
Bogdan Nagirniak merged 28 commits from BLEN-448 into hydra-render 2023-07-20 23:49:25 +02:00
Conversation 1 Commits 28 Files Changed 8 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a7b814878 - Show all commits

6
source/blender/render/hydra/scene_delegate/mesh.cc
View File

@ -13,7 +13,7 @@
#include "mesh.h" #include "mesh.h"
PXR_NAMESPACE_OPEN_SCOPE PXR_NAMESPACE_OPEN_SCOPE
TF_DEFINE_PRIVATE_TOKENS(_tokens, (st)); TF_DEFINE_PRIVATE_TOKENS(tokens_, (st));
PXR_NAMESPACE_CLOSE_SCOPE PXR_NAMESPACE_CLOSE_SCOPE
namespace blender::render::hydra { namespace blender::render::hydra {
@ -89,7 +89,7 @@ pxr::VtValue MeshData::get_data(pxr::SdfPath const &id, pxr::TfToken const &key)
else if (key == pxr::HdTokens->normals) { else if (key == pxr::HdTokens->normals) {
return pxr::VtValue(submesh(id).normals); return pxr::VtValue(submesh(id).normals);
} }
else if (key == pxr::_tokens->st) { else if (key == pxr::tokens_->st) {
return pxr::VtValue(submesh(id).uvs); return pxr::VtValue(submesh(id).uvs);
} }
return pxr::VtValue(); return pxr::VtValue();
@ -133,7 +133,7 @@ pxr::HdPrimvarDescriptorVector MeshData::primvar_descriptors(
} }
if (!submeshes_[0].uvs.empty()) { if (!submeshes_[0].uvs.empty()) {
primvars.emplace_back( primvars.emplace_back(
pxr::_tokens->st, interpolation, pxr::HdPrimvarRoleTokens->textureCoordinate); pxr::tokens_->st, interpolation, pxr::HdPrimvarRoleTokens->textureCoordinate);
} }
} }
return primvars; return primvars;