Merge "Remove un-used GetChildren internal actor api" into tizen

diff --git a/dali/internal/render/shaders/shader.cpp b/dali/internal/render/shaders/shader.cpp
index 2ca57e3..fded09a 100644 (file)
--- a/dali/internal/render/shaders/shader.cpp
+++ b/dali/internal/render/shaders/shader.cpp
@@ -468,7 +468,7 @@ void Shader::SetUniforms( Context& context,
           case Property::ARRAY:
           case Property::TYPE_COUNT:
           {
-            DALI_ASSERT_ALWAYS( 0 && "Invalid property type for a uniform" );
+            DALI_LOG_ERROR( "Invalid property type for a uniform" );
             break;
           }
         }