Explorar o código

Resolves the "conflict" with #1598

Areloch %!s(int64=9) %!d(string=hai) anos
pai
achega
27afd2ded1
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  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)
    {
       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);
       glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, bufSize, pboMemory );
+      dFree(pboMemory);
    }
    else
    {