source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc

@@ -386,8 +386,7 @@ void BlenderSceneDelegate::update_instancers(Object *object)
     return;
   }
 
-  instancers_.add_new(id, std::make_unique<InstancerData>(this, object, id));
-  i_data = instancer_data(id);
+  i_data = instancers_.lookup_or_add(id, std::make_unique<InstancerData>(this, object, id)).get();
   i_data->init();
   i_data->insert();
 }

source/blender/render/hydra/scene_delegate/mesh.cc

@@ -301,15 +301,14 @@ void MeshData::write_materials()
       m.mat_data = nullptr;
       continue;
     }
+
     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_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();
-      m.mat_data->insert();
-    }
+    m.mat_data = scene_delegate_->materials_
+                     .lookup_or_add(p_id,
+                                    std::make_unique<MaterialData>(scene_delegate_, mat, p_id))
+                     .get();
+    m.mat_data->init();
+    m.mat_data->insert();
   }
 }