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 "Updates after RenderableActor removal" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
default-controls
/
solid-color-actor.cpp
diff --git
a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
index
a43c874
..
5bf8561
100644
(file)
--- a/
dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
+++ b/
dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
@@
-46,6
+46,11
@@
ImageActor CreateSolidColorActor( const Vector4& color, bool border, const Vecto
// Create the image
PixelBuffer* pixbuf = imageData.GetBuffer();
+ if( !pixbuf )
+ {
+ return image;
+ }
+
Vector4 outerColor = color;
if ( border )
{