Merge "[4.0] Disable texture atlas in svg visual" into tizen_4.0

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 552be56..1673f0e 100755 (executable)
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -164,6 +164,13 @@ void Controller::SetGlyphType( TextAbstraction::GlyphType glyphType )
 void Controller::SetMarkupProcessorEnabled( bool enable )
 {
   mImpl->mMarkupProcessorEnabled = enable;
+  if( enable )
+  {
+    //If Text was already set, call the SetText again for enabling markup
+    std::string text;
+    GetText( text );
+    SetText( text );
+  }
 }
 
 bool Controller::IsMarkupProcessorEnabled() const