Merge "Fixups following changes to actor traversal" into devel/master

diff --git a/dali-toolkit/internal/visuals/texture-manager.cpp b/dali-toolkit/internal/visuals/texture-manager.cpp
index 21fda25..b113438 100644 (file)
--- a/dali-toolkit/internal/visuals/texture-manager.cpp
+++ b/dali-toolkit/internal/visuals/texture-manager.cpp
@@ -450,7 +450,7 @@ void TextureManager::ApplyMask( PixelData pixelData, TextureId maskTextureId )
 
 void TextureManager::UploadTexture( PixelData pixelData, TextureInfo& textureInfo )
 {
-  if( textureInfo.useAtlas != USE_ATLAS );
+  if( textureInfo.useAtlas != USE_ATLAS )
   {
     DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "  TextureManager::UploadTexture() New Texture for textureId:%d\n", textureInfo.textureId );