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

Merge pull request #3032 from dumganhar/iss2342-build-errors 

closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
This commit is contained in:
James Chen 2013-06-29 00:05:31 -07:00
parent 0f048e23bf b76798505c
commit 2c08f25c47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/textures/CCTexture2D.cpp
View File

@ -515,7 +515,7 @@ bool Texture2D::initWithString(const char *text, ccFontDefinition *textDefinitio
#if CC_ENABLE_CACHE_TEXTURE_DATA
// cache the texture data
VolatileTexture::addStringTexture(this, text, dimensions, hAlignment, vAlignment, fontName, fontSize);
VolatileTexture::addStringTexture(this, text, textDefinition->_dimensions, textDefinition->_alignment, textDefinition->_vertAlignment, textDefinition->_fontName.c_str(), textDefinition->_fontSize);
#endif
bool bRet = false;