projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed some debugging code that I didn't mean to commit.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_scale.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index
7bd8d18
..
181cc29
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@
-174,7
+174,11
@@
synfig::ValueNode_Scale::operator()(Time t)const
return (*value_node)(t).get(Time())*(*scalar)(t).get(Time());
else
if(get_type()==ValueBase::TYPE_INTEGER)
return (*value_node)(t).get(Time())*(*scalar)(t).get(Time());
else
if(get_type()==ValueBase::TYPE_INTEGER)
- return (*value_node)(t).get(int())*(*scalar)(t).get(Real());
+ {
+ Real ret = (*value_node)(t).get(int())*(*scalar)(t).get(Real()) + 0.5f;
+ if (ret < 0) return static_cast<int>(ret-1);
+ return static_cast<int>(ret);
+ }
else
if(get_type()==ValueBase::TYPE_ANGLE)
return (*value_node)(t).get(Angle())*(*scalar)(t).get(Real());
else
if(get_type()==ValueBase::TYPE_ANGLE)
return (*value_node)(t).get(Angle())*(*scalar)(t).get(Real());