projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed text controls to re-apply style after system font size change" into...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index
4b9de21
..
f539dd6
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@
-79,7
+79,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
{
if( !vertexShaderValue->Get( mVertexShader ) )
{
{
if( !vertexShaderValue->Get( mVertexShader ) )
{
- DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string", CUSTOM_VERTEX_SHADER );
+ DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string
\n
", CUSTOM_VERTEX_SHADER );
}
}
}
}
@@
-88,7
+88,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
{
if( !fragmentShaderValue->Get( mFragmentShader ) )
{
{
if( !fragmentShaderValue->Get( mFragmentShader ) )
{
- DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string", CUSTOM_FRAGMENT_SHADER );
+ DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string
\n
", CUSTOM_FRAGMENT_SHADER );
}
}
}
}
@@
-98,7
+98,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
int subdivideX;
if( !subdivideXValue->Get( subdivideX ) || subdivideX < 1 )
{
int subdivideX;
if( !subdivideXValue->Get( subdivideX ) || subdivideX < 1 )
{
- DALI_LOG_ERROR( "'%s' parameter does not correctly specify a value greater than 1", CUSTOM_SUBDIVIDE_GRID_X );
+ DALI_LOG_ERROR( "'%s' parameter does not correctly specify a value greater than 1
\n
", CUSTOM_SUBDIVIDE_GRID_X );
}
else
{
}
else
{
@@
-112,7
+112,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
int subdivideY;
if( !subdivideYValue->Get( subdivideY ) || subdivideY < 1 )
{
int subdivideY;
if( !subdivideYValue->Get( subdivideY ) || subdivideY < 1 )
{
- DALI_LOG_ERROR( "'%s' parameter does not correctly specify a value greater than 1", CUSTOM_SUBDIVIDE_GRID_Y );
+ DALI_LOG_ERROR( "'%s' parameter does not correctly specify a value greater than 1
\n
", CUSTOM_SUBDIVIDE_GRID_Y );
}
else
{
}
else
{
@@
-125,7
+125,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
{
if ( ! Scripting::GetBitmaskEnumerationProperty( *hintsValue, SHADER_HINT_TABLE, SHADER_HINT_TABLE_COUNT, mHints ) )
{
{
if ( ! Scripting::GetBitmaskEnumerationProperty( *hintsValue, SHADER_HINT_TABLE, SHADER_HINT_TABLE_COUNT, mHints ) )
{
- DALI_LOG_ERROR( "'%s' parameter does not correctly specify a hint or an array of hint strings", CUSTOM_SHADER_HINTS );
+ DALI_LOG_ERROR( "'%s' parameter does not correctly specify a hint or an array of hint strings
\n
", CUSTOM_SHADER_HINTS );
}
}
}
}
}
}