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
Changes in Javascript plugin to compile under new mesh api
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
ca264ab
..
d4a2a3e
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-176,11
+176,6
@@
std::string PropertyValueToString( const Property::Value& value )
ret = std::string("Map Size=") + ToString( value.Get<Property::Map>().Count() );
break;
}
ret = std::string("Map Size=") + ToString( value.Get<Property::Map>().Count() );
break;
}
- case Property::TYPE_COUNT:
- {
- ret = "";
- break;
- }
}
return ret;
}
return ret;
@@
-263,7
+258,7
@@
void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
// special field 'effect' references the shader effect instances
if(key == "effect")
{
// special field 'effect' references the shader effect instances
if(key == "effect")
{
-
RenderableActor actor = Renderabl
eActor::DownCast(handle);
+
ImageActor actor = Imag
eActor::DownCast(handle);
if( actor )
{
OptionalString str = constant.IsString( keyChild.second );
if( actor )
{
OptionalString str = constant.IsString( keyChild.second );
@@
-287,7
+282,7
@@
void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
if( Property::INVALID_INDEX == index )
{
if( Property::INVALID_INDEX == index )
{
-
RenderableActor actor = Renderabl
eActor::DownCast(handle);
+
ImageActor actor = Imag
eActor::DownCast(handle);
if( actor )
{
if( ShaderEffect effect = actor.GetShaderEffect() )
if( actor )
{
if( ShaderEffect effect = actor.GetShaderEffect() )