Downgraded assert on SetUniform to a log error. 07/38607/3
authorDavid Steele <david.steele@partner.samsung.com>
Wed, 22 Apr 2015 15:39:30 +0000 (16:39 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Wed, 29 Apr 2015 18:35:30 +0000 (11:35 -0700)
Change-Id: Id71cd9785f0a828745be9c49ab699e64ef74347c
Signed-off-by: David Steele <david.steele@partner.samsung.com>
dali/internal/render/shaders/shader.cpp

index 2ca57e3..fded09a 100644 (file)
@@ -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;
           }
         }