label:fixed incorrect effect of outline.

thaithien · Mar 14, 2014 · 6ef2162 · 6ef2162
1 parent 4ce21f3
commit 6ef2162
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -404,6 +404,8 @@ bool Label::setTTFConfig(const TTFConfig& ttfConfig)
         return false;
     }
 
+    setFontAtlas(newAtlas,ttfConfig.distanceFieldEnabled,true);
+
     _fontConfig = ttfConfig;
     if (_fontConfig.outlineSize > 0)
     {
@@ -418,8 +420,6 @@ bool Label::setTTFConfig(const TTFConfig& ttfConfig)
         this->setFontScale(1.0f * ttfConfig.fontSize / DistanceFieldFontSize);
     }
 
-    setFontAtlas(newAtlas,ttfConfig.distanceFieldEnabled,true);
-
     _currentLabelType = LabelType::TTF;
 
     return true;