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 "Calculate a new height when full relayout needed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.cpp
b/dali-toolkit/internal/visuals/image/image-visual.cpp
index
de7b3b8
..
d050442
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-470,6
+470,7
@@
void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v
{
bool atlasing = false;
mAttemptAtlasing = value.Get( atlasing );
+ break;
}
case Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL:
@@
-479,6
+480,7
@@
void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v
{
mAlphaMaskUrl = VisualUrl( alphaUrl );
}
+ break;
}
}
}