Removing multiple inheritance from cmd buffers

This commit is contained in:
Dynamitos
2021-10-19 11:00:39 +02:00
parent 1e742c1f45
commit a0693daa67
14 changed files with 131 additions and 121 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ void MeshAsset::load()
void MeshAsset::addMesh(PMesh mesh)
{
std::scoped_lock lck(lock);
std::unique_lock lck(lock);
meshes.add(mesh);
referencedMaterials.add(mesh->referencedMaterial);
}
+2 -2
View File
@@ -14,12 +14,12 @@ public:
virtual void load() override;
void setTexture(Gfx::PTexture texture)
{
std::scoped_lock lck(lock);
std::unique_lock lck(lock);
this->texture = texture;
}
Gfx::PTexture getTexture()
{
std::scoped_lock lck(lock);
std::unique_lock lck(lock);
return texture;
}
private: