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

Move to use blender::Map container instead std::unordered_map #47

Merged
Bogdan Nagirniak merged 17 commits from Vasyl-Pidhirskyi/blender_bn:BLEN-418 into hydra-render 2023-06-02 12:02:46 +02:00
Conversation 0 Commits 17 Files Changed 12 +8 -10
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c47f08f2e1 - Show all commits

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

@ -361,7 +361,7 @@ void InstancerData::write_instances()
if (ob->type == OB_LAMP) { if (ob->type == OB_LAMP) {
LightInstance *inst = light_instance(p_id); LightInstance *inst = light_instance(p_id);
if (!inst) { if (!inst) {
inst = light_instances_.lookup_ptr(p_id); inst = &light_instances_.lookup_or_add_default(p_id);
Vasyl-Pidhirskyi marked this conversation as resolved Outdated
Georgiy Markelov commented 2023-05-30 14:10:04 +02:00
Outdated
Review
Copy Link

lookup instead of lookup_ptr also crash here due to inst is empty

`lookup` instead of `lookup_ptr` also crash here due to `inst` is empty
inst->data = std::make_unique<LightData>(scene_delegate_, ob, p_id); inst->data = std::make_unique<LightData>(scene_delegate_, ob, p_id);
inst->data->init(); inst->data->init();
} }
@ -371,16 +371,14 @@ void InstancerData::write_instances()
else { else {
MeshInstance *inst = mesh_instance(p_id); MeshInstance *inst = mesh_instance(p_id);
if (!inst) { if (!inst) {
inst = mesh_instances_.lookup_ptr(p_id); inst = &mesh_instances_.lookup_or_add_default(p_id);
Vasyl-Pidhirskyi marked this conversation as resolved Outdated
Georgiy Markelov commented 2023-05-30 14:10:12 +02:00
Outdated
Review
Copy Link

lookup instead of lookup_ptr

`lookup` instead of `lookup_ptr`
if (inst) { inst->data = std::make_unique<MeshData>(scene_delegate_, ob, p_id);
Vasyl-Pidhirskyi marked this conversation as resolved Outdated
Georgiy Markelov commented 2023-05-30 14:04:38 +02:00
Outdated
Review
Copy Link

check logic here

check logic here
inst->data = std::make_unique<MeshData>(scene_delegate_, ob, p_id); inst->data->init();
inst->data->init(); inst->data->insert();
inst->data->insert();
ID_LOG(2, "Mesh %s %d", inst->data->id->name, mesh_transforms_.size());
inst->indices.push_back(mesh_transforms_.size());
mesh_transforms_.push_back(gf_matrix_from_transform(dupli->mat));
}
} }
ID_LOG(2, "Mesh %s %d", inst->data->id->name, mesh_transforms_.size());
inst->indices.push_back(mesh_transforms_.size());
mesh_transforms_.push_back(gf_matrix_from_transform(dupli->mat));
} }
} }
free_object_duplilist(lb); free_object_duplilist(lb);