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 "Fixed texture-manager crash for async load complete" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
color
/
color-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/color/color-visual.cpp
b/dali-toolkit/internal/visuals/color/color-visual.cpp
index
0ac80d6
..
31922ba
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.cpp
+++ b/
dali-toolkit/internal/visuals/color/color-visual.cpp
@@
-129,6
+129,9
@@
void ColorVisual::DoSetOnStage( Actor& actor )
InitializeRenderer();
actor.AddRenderer( mImpl->mRenderer );
InitializeRenderer();
actor.AddRenderer( mImpl->mRenderer );
+
+ // Color Visual generated and ready to display
+ ResourceReady();
}
void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const
}
void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const
@@
-138,6
+141,12
@@
void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const
map.Insert( Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor );
}
map.Insert( Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor );
}
+void ColorVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
+{
+ // Do nothing
+}
+
+
void ColorVisual::OnSetTransform()
{
if( mImpl->mRenderer )
void ColorVisual::OnSetTransform()
{
if( mImpl->mRenderer )