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 +12 -8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8359745e42 - Show all commits

5
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc
View File

@ -414,11 +414,6 @@ pxr::GfMatrix4d BlenderSceneDelegate::GetTransform(pxr::SdfPath const &id)
return world_data->transform(); return world_data->transform();
} }
InstancerData *i_data = instancer_data(id);
if (i_data) {
return i_data->transform();
}
return pxr::GfMatrix4d(); return pxr::GfMatrix4d();
} }

15
source/blender/render/hydra/scene_delegate/instancer.cc
View File

@ -54,9 +54,6 @@ void InstancerData::init()
{ {
ID_LOG(2, ""); ID_LOG(2, "");
set_instances(); set_instances();
for (auto &it : instances) {
it.second.obj_data->init();
}
} }
pxr::GfMatrix4d InstancerData::transform() pxr::GfMatrix4d InstancerData::transform()
@ -138,6 +135,8 @@ void InstancerData::set_instances()
continue; continue;
} }
inst->obj_data = std::make_unique<InstanceMeshData>(scene_delegate, dupli->ob, path); inst->obj_data = std::make_unique<InstanceMeshData>(scene_delegate, dupli->ob, path);
inst->obj_data->init();
inst->obj_data->insert();
} }
else { else {
inst = &it->second; inst = &it->second;
@ -148,6 +147,16 @@ void InstancerData::set_instances()
++index; ++index;
} }
free_object_duplilist(lb); free_object_duplilist(lb);
/* Remove intances without indices */
for (auto it = instances.begin(); it != instances.end(); ++it) {
if (!it->second.indices.empty()) {
continue;
}
it->second.obj_data->remove();
instances.erase(it);
it = instances.begin();
}
} }
void InstancerData::insert() void InstancerData::insert()