Merge "[4.0] Fix UpdateRender if statement." into tizen_4.0

diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp
index fb45b54..faa0927 100755 (executable)
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@ -640,7 +640,12 @@ void TextVisual::UpdateRenderer()
   relayoutSize.height = floorf( 0.5f + ( isHeightRelative ? mImpl->mControlSize.height * mImpl->mTransform.mSize.y : mImpl->mTransform.mSize.height ) );
 
   float alpha = control.GetProperty< float >( Actor::Property::COLOR_ALPHA );
-  Vector4 animatableTextColor = control.GetProperty< Vector4 >( mAnimatableTextColorPropertyIndex );
+  Vector4 animatableTextColor = Color::WHITE;
+  if( mAnimatableTextColorPropertyIndex != Property::INVALID_INDEX )
+  {
+    animatableTextColor = control.GetProperty< Vector4 >( mAnimatableTextColorPropertyIndex );
+  }
+
   if( ( fabsf( relayoutSize.width ) < Math::MACHINE_EPSILON_1000 ) || ( fabsf( relayoutSize.height ) < Math::MACHINE_EPSILON_1000 )
       || mTypesetter->GetViewModel()->GetNumberOfLines() == 0 || alpha == 0.0f || animatableTextColor.a == 0.0f )
   {