commit | 40a205aee16175b9e296bc79bb403986c81422dd | [log] [tgz] |
---|---|---|
author | Adam Sawicki <adam.sawicki@amd.com> | Mon Sep 30 14:36:36 2019 +0200 |
committer | GitHub <noreply@github.com> | Mon Sep 30 14:36:36 2019 +0200 |
tree | 2f02d338d0ed2619770ac3a81f57941d195abfdf | |
parent | 8341ef44a4151b2d7eeb9d23c9552b7eec28f825 [diff] | |
parent | f794a64c5742d4e68a6af9e7f003a6dde98a16c0 [diff] |
Merge pull request #1 from Silveryard/master Fixed compilation error in Vector::reserve
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp index d4f4e1a..f0c5385 100644 --- a/src/D3D12MemAlloc.cpp +++ b/src/D3D12MemAlloc.cpp
@@ -614,7 +614,7 @@ { memcpy(newArray, m_pArray, m_Count * sizeof(T)); } - Free(m_Allocator.m_pCallbacks, m_pArray); + Free(m_AllocationCallbacks, m_pArray); m_Capacity = newCapacity; m_pArray = newArray; }