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

Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
James Chen 2013-03-25 11:46:02 +08:00
parent 79f88fcf77 21cab34029
commit 92f278657e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos2dx/particle_nodes/CCParticleBatchNode.cpp
View File

@ -42,6 +42,7 @@
#include "support/zip_support/ZipUtils.h" #include "support/zip_support/ZipUtils.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "kazmath/GL/matrix.h" #include "kazmath/GL/matrix.h"
#include "support/CCProfiling.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -402,7 +403,7 @@ void CCParticleBatchNode::removeAllChildrenWithCleanup(bool doCleanup)
void CCParticleBatchNode::draw(void) void CCParticleBatchNode::draw(void)
{ {
CC_PROFILER_STOP("CCParticleBatchNode - draw"); CC_PROFILER_START("CCParticleBatchNode - draw");
if( m_pTextureAtlas->getTotalQuads() == 0 ) if( m_pTextureAtlas->getTotalQuads() == 0 )
{ {