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

BLEN-326: Pass MaterialX to Hydra via hdMaterialNetwork #5

Merged
Bogdan Nagirniak merged 4 commits from George-Shakula/blender:mtlx-translation into hydra-render 2023-03-02 12:35:51 +01:00
Conversation 6 Commits 4 Files Changed 7 +3 -3
3 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 b19266c88f - Show all commits

2
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.cc
View File

@ -343,7 +343,7 @@ VtValue BlenderSceneDelegate::GetMaterialResource(SdfPath const& id)
{ {
MaterialData *mat_data = material_data(id); MaterialData *mat_data = material_data(id);
if (mat_data) { if (mat_data) {
return mat_data->material_resource(this); return mat_data->material_resource();
} }
return VtValue(); return VtValue();
} }

2
source/blender/render/hydra/sceneDelegate/material.cc
View File

@ -49,7 +49,7 @@ VtValue MaterialData::get_data(TfToken const &key)
return ret; return ret;
} }
pxr::VtValue MaterialData::material_resource(pxr::HdSceneDelegate *scene_delegate) pxr::VtValue MaterialData::material_resource()
{ {
#if defined(_MTLX_TRANSLATION_ENABLED) #if defined(_MTLX_TRANSLATION_ENABLED)
std::string const &path = mtlx_path.GetResolvedPath(); std::string const &path = mtlx_path.GetResolvedPath();

2
source/blender/render/hydra/sceneDelegate/material.h
View File

@ -25,7 +25,7 @@ class MaterialData: IdData {
void remove_prim() override; void remove_prim() override;
void mark_prim_dirty(DirtyBits dirty_bits) override; void mark_prim_dirty(DirtyBits dirty_bits) override;
pxr::VtValue material_resource(pxr::HdSceneDelegate *scene_delegate); pxr::VtValue material_resource();
George-Shakula marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-27 20:01:19 +01:00
Review
Copy Link

scene_delegate is already available in MaterialData from IdData

`scene_delegate` is already available in MaterialData from IdData
void export_mtlx(); void export_mtlx();
private: private: