projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix MSVC warning.
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
common
/
animatable-property.h
diff --git
a/dali/internal/update/common/animatable-property.h
b/dali/internal/update/common/animatable-property.h
index
348d849
..
2a82031
100644
(file)
--- a/
dali/internal/update/common/animatable-property.h
+++ b/
dali/internal/update/common/animatable-property.h
@@
-205,7
+205,7
@@
public:
// false + false does not change value, true + false does not either
if( delta && !mValue[bufferIndex] )
{
// false + false does not change value, true + false does not either
if( delta && !mValue[bufferIndex] )
{
- mValue[bufferIndex]
+
= delta;
+ mValue[bufferIndex] = delta;
OnSet();
}
OnSet();
}
@@
-274,7
+274,7
@@
public:
*/
void BakeRelative(BufferIndex bufferIndex, bool delta)
{
*/
void BakeRelative(BufferIndex bufferIndex, bool delta)
{
- mValue[bufferIndex]
+=
delta;
+ mValue[bufferIndex]
= mValue[bufferIndex] ||
delta;
mBaseValue = mValue[bufferIndex];
OnBake();
mBaseValue = mValue[bufferIndex];
OnBake();