1
0

Merge branch 'master' into chunksparsing/structs

Conflicts:
	src/Chunk.cpp
	src/Chunk.h
This commit is contained in:
Tycho
2014-04-27 06:35:27 -07:00
188 changed files with 11188 additions and 4931 deletions

View File

@@ -283,6 +283,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
{
a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ);
}
a_Item.Disable();
delete &a_Item;
}