Ensured disabled batching reverts to ImageVisual

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-factory-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index bcc9acd..6baaec2 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -149,16 +149,17 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
         }
         else // Regular image
         {
         }
         else // Regular image
         {

+          bool batchingEnabled( false );

           Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
           if( batchingEnabledValue  )
           {
           Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
           if( batchingEnabledValue  )
           {

-            bool batchingEnabled( false );

             batchingEnabledValue->Get( batchingEnabled );
             batchingEnabledValue->Get( batchingEnabled );

-            if( batchingEnabled )
-            {
-              visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
-              break;
-            }
+          }
+
+          if( batchingEnabled )
+          {
+            visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
+            break;

           }
           else
           {
           }
           else
           {