Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #837 from dumganhar/gles20 

fixed #1158: Fixed a bug in CCParticleSystemQuad.
We need to check whether need to free quads and delete vbo/vao in the destructor.

CCParticleSystemQuad::~CCParticleSystemQuad()
{
if (NULL == m_pBatchNode) // important
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
This commit is contained in:
James Chen 2012-04-12 20:43:02 -07:00
parent 7cf16dbb32 f7a1807865
commit be525c7e57
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
View File

@ -76,10 +76,13 @@ CCParticleSystemQuad::CCParticleSystemQuad()
CCParticleSystemQuad::~CCParticleSystemQuad()
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
if (NULL == m_pBatchNode)
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
// implementation CCParticleSystemQuad