Merge "Check renderer when call DisplayNextFrame()" into devel/master

diff --git a/dali-toolkit/internal/visuals/npatch-data.cpp b/dali-toolkit/internal/visuals/npatch-data.cpp
index 1097395..e959003 100644 (file)
--- a/dali-toolkit/internal/visuals/npatch-data.cpp
+++ b/dali-toolkit/internal/visuals/npatch-data.cpp
@@ -42,6 +42,7 @@ NPatchData::NPatchData()
   mCroppedHeight(0),
   mBorder(0, 0, 0, 0),
   mLoadingState(LoadingState::LOADING),
+  mPreMultiplyOnLoad(false),
   mRenderingMap{nullptr}
 {
 }

diff --git a/dali-toolkit/internal/visuals/npatch-loader.cpp b/dali-toolkit/internal/visuals/npatch-loader.cpp
index f5d92ab..f0b154a 100644 (file)
--- a/dali-toolkit/internal/visuals/npatch-loader.cpp
+++ b/dali-toolkit/internal/visuals/npatch-loader.cpp
@@ -155,7 +155,6 @@ int32_t NPatchLoader::GetCacheIndexFromId( const NPatchData::NPatchDataId id )
     }
   }
 
-  DALI_LOG_ERROR("Wrong NPatchDataId is used\n");
   return INVALID_CACHE_INDEX;
 }