projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the use of horizontal scrolling to adjust the current time in timeslider widget...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_timedswap.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index
20be99f
..
39cc91d
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@
-1,6
+1,6
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_timedswap.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_timedswap.cpp
-** \brief
Template File
+** \brief
Implementation of the "Timed Swap" valuenode conversion.
**
** $Id$
**
**
** $Id$
**
@@
-35,6
+35,7
@@
#include "valuenode_const.h"
#include <stdexcept>
#include "color.h"
#include "valuenode_const.h"
#include <stdexcept>
#include "color.h"
+#include <ETL/misc>
#endif
#endif
@@
-220,7
+221,7
@@
synfig::ValueNode_TimedSwap::operator()(Time t)const
{
float a=(float)(*after)(t).get(int());
float b=(float)(*before)(t).get(int());
{
float a=(float)(*after)(t).get(int());
float b=(float)(*before)(t).get(int());
- return
static_cast<int>((b-a)*amount+a+0.5f
);
+ return
round_to_int((b-a)*amount+a
);
}
case ValueBase::TYPE_REAL:
{
}
case ValueBase::TYPE_REAL:
{