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

Merge pull request #14656 from zilongshanren/v3.10 

fix bmfont size initialize error
This commit is contained in:
zilongshanren 2015-12-13 22:22:05 +08:00
parent 2ef0197534 b1d700ad33
commit b87e638f26
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCLabel.cpp
View File

@ -591,11 +591,9 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Vec2& ima
FontFNT *bmFont = (FontFNT*)newAtlas->getFont(); FontFNT *bmFont = (FontFNT*)newAtlas->getFont();
if (bmFont) { if (bmFont) {
float originalFontSize = bmFont->getOriginalFontSize(); float originalFontSize = bmFont->getOriginalFontSize();
if(fabs(_bmFontSize+1) < FLT_EPSILON){
_bmFontSize = originalFontSize / CC_CONTENT_SCALE_FACTOR(); _bmFontSize = originalFontSize / CC_CONTENT_SCALE_FACTOR();
} }
} }
}
if(fontSize > 0.0f){ if(fontSize > 0.0f){
_bmFontSize = fontSize; _bmFontSize = fontSize;