Removing multiple inheritance from cmd buffers
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user