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 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49013bffef - Show all commits

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

@ -349,7 +349,7 @@ void BlenderSceneDelegate::update_objects(Object *object)
return;
}
objects_.add_overwrite(id, ObjectData::create(this, object, id));
objects_.add_new(id, ObjectData::create(this, object, id));
obj_data = object_data(id);
obj_data->update_parent();
obj_data->init();
@ -386,7 +386,7 @@ void BlenderSceneDelegate::update_instancers(Object *object)
return;
}
instancers_.add_overwrite(id, std::make_unique<InstancerData>(this, object, id));
instancers_.add_new(id, std::make_unique<InstancerData>(this, object, id));
i_data = instancer_data(id);
i_data->init();
i_data->insert();

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

@ -199,7 +199,7 @@ void CurvesData::write_material()
pxr::SdfPath p_id = scene_delegate_->material_prim_id(mat);
mat_data_ = scene_delegate_->material_data(p_id);
if (!mat_data_) {
scene_delegate_->materials_.add_overwrite(
scene_delegate_->materials_.add_new(
p_id, std::make_unique<MaterialData>(scene_delegate_, mat, p_id));
mat_data_ = scene_delegate_->material_data(p_id);
mat_data_->init();

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

@ -304,7 +304,7 @@ void MeshData::write_materials()
pxr::SdfPath p_id = scene_delegate_->material_prim_id(mat);
m.mat_data = scene_delegate_->material_data(p_id);
if (!m.mat_data) {
scene_delegate_->materials_.add_overwrite(
scene_delegate_->materials_.add_new(
p_id, std::make_unique<MaterialData>(scene_delegate_, mat, p_id));
m.mat_data = scene_delegate_->material_data(p_id);
m.mat_data->init();