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

Support several instancers on one object #24

Merged
Bogdan Nagirniak merged 16 commits from BLEN-383 into hydra-render 2023-04-19 02:46:24 +02:00
Conversation 0 Commits 16 Files Changed 10 +1 -2
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cae406cd60 - Show all commits

1
source/blender/render/hydra/scene_delegate/material.cc
View File

@ -101,7 +101,6 @@ pxr::VtValue MaterialData::get_data(pxr::TfToken const &key) const
pxr::VtValue MaterialData::material_resource() pxr::VtValue MaterialData::material_resource()
{ {
return material_network_map;
if (material_network_map.IsEmpty()) { if (material_network_map.IsEmpty()) {
const std::string &path = mtlx_path.GetResolvedPath(); const std::string &path = mtlx_path.GetResolvedPath();
if (!path.empty()) { if (!path.empty()) {

2
source/blender/render/hydra/scene_delegate/world.cc
View File

@ -157,7 +157,7 @@ void WorldData::insert()
void WorldData::remove() void WorldData::remove()
{ {
ID_LOG(2, ""); CLOG_INFO(LOG_BSD, 2, "%s", p_id.GetText());
scene_delegate->GetRenderIndex().RemoveSprim(pxr::HdPrimTypeTokens->domeLight, p_id); scene_delegate->GetRenderIndex().RemoveSprim(pxr::HdPrimTypeTokens->domeLight, p_id);
} }