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

Merge remote-tracking branch 'upstream/gles20' into gles20

This commit is contained in:
moadib 2012-09-06 12:45:07 +04:00
parent a574d17bed 10069f8b99
commit eeb89d2404
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/base_nodes/CCAtlasNode.cpp
View File

@ -101,7 +101,6 @@ bool CCAtlasNode::initWithTileFile(const char *tile, unsigned int tileWidth, uns
if (! m_pTextureAtlas)
{
CCLOG("cocos2d: Could not initialize CCAtlasNode. Invalid Texture.");
delete this;
return false;
}

1
cocos2dx/effects/CCGrid.cpp
View File

@ -146,7 +146,6 @@ bool CCGridBase::initWithSize(const ccGridSize& gridSize)
if (! pTexture)
{
CCLOG("cocos2d: CCGrid: error creating texture");
delete this;
return false;
}

4
cocos2dx/textures/CCTextureAtlas.cpp
View File

@ -148,9 +148,7 @@ bool CCTextureAtlas::initWithFile(const char * file, unsigned int capacity)
else
{
CCLOG("cocos2d: Could not open file: %s", file);
delete this;
return NULL;
return false;
}
}