Browse Source

Resolves the "conflict" with #1598

Areloch 9 years ago
parent
commit
27afd2ded1
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Engine/source/gfx/gl/gfxGLTextureManager.cpp

+ 2 - 2
Engine/source/gfx/gl/gfxGLTextureManager.cpp

@@ -235,10 +235,10 @@ static void _fastTextureLoad(GFXGLTextureObject* texture, GBitmap* pDL)
    if(pDL->getFormat() == GFXFormatR8G8B8A8 || pDL->getFormat() == GFXFormatR8G8B8X8)
    if(pDL->getFormat() == GFXFormatR8G8B8A8 || pDL->getFormat() == GFXFormatR8G8B8X8)
    {
    {
       PROFILE_SCOPE(Swizzle32_Upload);
       PROFILE_SCOPE(Swizzle32_Upload);
-      FrameAllocatorMarker mem;
-      U8* pboMemory = (U8*)mem.alloc(bufSize);
+      U8* pboMemory = (U8*)dMalloc(bufSize);
       GFX->getDeviceSwizzle32()->ToBuffer(pboMemory, pDL->getBits(0), bufSize);
       GFX->getDeviceSwizzle32()->ToBuffer(pboMemory, pDL->getBits(0), bufSize);
       glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, bufSize, pboMemory );
       glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, bufSize, pboMemory );
+      dFree(pboMemory);
    }
    }
    else
    else
    {
    {