Merge branch 'master' into vulkan
This commit is contained in:
@@ -33,7 +33,7 @@ namespace Nz
|
||||
Buffer(BufferType type);
|
||||
Buffer(BufferType type, UInt32 size, DataStorage storage = DataStorage_Software, BufferUsageFlags usage = 0);
|
||||
Buffer(const Buffer&) = delete;
|
||||
Buffer(Buffer&&) = default;
|
||||
Buffer(Buffer&&) = delete;
|
||||
~Buffer();
|
||||
|
||||
bool CopyContent(const BufferRef& buffer);
|
||||
@@ -61,7 +61,7 @@ namespace Nz
|
||||
void Unmap() const;
|
||||
|
||||
Buffer& operator=(const Buffer&) = delete;
|
||||
Buffer& operator=(Buffer&&) = default;
|
||||
Buffer& operator=(Buffer&&) = delete;
|
||||
|
||||
static bool IsStorageSupported(DataStorage storage);
|
||||
template<typename... Args> static BufferRef New(Args&&... args);
|
||||
|
||||
@@ -10,7 +10,8 @@ namespace Nz
|
||||
{
|
||||
Mesh::Mesh() :
|
||||
m_materialData(1),
|
||||
m_aabbUpdated(false)
|
||||
m_aabbUpdated(false),
|
||||
m_isValid(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user