From b1d700ad33f882a7b99e8e5a00160fab47a36d22 Mon Sep 17 00:00:00 2001
From: zilongshanren <guanghui8827@126.com>
Date: Sun, 13 Dec 2015 13:59:42 +0800
Subject: [PATCH] fix bmfont size error

---
 cocos/2d/CCLabel.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
index ccf3e09c54..cfcbd019dc 100644
--- a/cocos/2d/CCLabel.cpp
+++ b/cocos/2d/CCLabel.cpp
@@ -591,9 +591,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Vec2& ima
         FontFNT *bmFont = (FontFNT*)newAtlas->getFont();
         if (bmFont) {
             float originalFontSize = bmFont->getOriginalFontSize();
-            if(fabs(_bmFontSize+1) < FLT_EPSILON){
-                _bmFontSize = originalFontSize / CC_CONTENT_SCALE_FACTOR();
-            }
+            _bmFontSize = originalFontSize / CC_CONTENT_SCALE_FACTOR();
         }
     }