Revert public API changes. BATCH property.

* Use the BATCH property from the devel API.

Change-Id: I4f7b006c85859058a27a7a515f802c4906c8d2af
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp
index 0af5b41..18ca0c7 100644 (file)
--- a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp
@@ -24,6 +24,7 @@
 #include <dali/public-api/images/native-image.h>
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/adaptor-framework/bitmap-loader.h>
 #include <dali/public-api/images/native-image.h>
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/adaptor-framework/bitmap-loader.h>

+#include <dali/devel-api/rendering/renderer-devel.h>

 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/rendering/texture.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/rendering/texture.h>
 #include <dali/public-api/rendering/texture-set.h>


@@ -191,7 +192,7 @@ void BatchImageVisual::InitializeRenderer( const std::string& imageUrl )
       mImpl->mRenderer.SetTextures( textureSet );
 
       // Turn batching on, to send message it must be on stage.
       mImpl->mRenderer.SetTextures( textureSet );
 
       // Turn batching on, to send message it must be on stage.

-      mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true );
+      mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true );

     }
     mImpl->mFlags |= Impl::IS_FROM_CACHE;
   }
     }
     mImpl->mFlags |= Impl::IS_FROM_CACHE;
   }


@@ -204,7 +205,7 @@ void BatchImageVisual::DoSetOnStage( Actor& actor )
     InitializeRenderer( mImageUrl );
   }
   // Turn batching on, to send message it must be on stage
     InitializeRenderer( mImageUrl );
   }
   // Turn batching on, to send message it must be on stage

-  mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true );
+  mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true );

 
   actor.AddRenderer( mImpl->mRenderer );
 }
 
   actor.AddRenderer( mImpl->mRenderer );
 }