diff options
| author | oy <Tom_Adams@web.de> | 2013-02-24 18:55:55 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2013-02-24 18:55:55 +0100 |
| commit | 0e92dd560300a0b255b5c173e715f2714e7c1765 (patch) | |
| tree | cc261eadddbd707b56dd018757c251a578a98384 /src/engine/client/graphics_threaded.cpp | |
| parent | 118d2ac837537cd625679a57aca03cd47f2e71a1 (diff) | |
| download | zcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.tar.gz zcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.zip | |
fixed some merge problems
Diffstat (limited to 'src/engine/client/graphics_threaded.cpp')
| -rw-r--r-- | src/engine/client/graphics_threaded.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp index 0357c41a..e34b7259 100644 --- a/src/engine/client/graphics_threaded.cpp +++ b/src/engine/client/graphics_threaded.cpp @@ -277,7 +277,7 @@ int CGraphics_Threaded::UnloadTexture(int Index) Cmd.m_Slot = Index; m_pCommandBuffer->AddCommand(Cmd); - m_aTextures[Index] = m_FirstFreeTexture; + m_aTextureIndices[Index] = m_FirstFreeTexture; m_FirstFreeTexture = Index; return 0; } |