projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a copy-paste typo when applying the 'scale' convert type to a color. Previously...
[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
ef0ac19
..
fdba277
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@
-55,7
+55,8
@@
using namespace synfig;
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL)
+ValueNode_Scale::ValueNode_Scale():
+ LinkableValueNode(synfig::ValueBase::TYPE_NIL)
{
set_scalar(1.0);
}
{
set_scalar(1.0);
}
@@
-177,8
+178,8
@@
synfig::ValueNode_Scale::operator()(Time t)const
Color ret((*value_node)(t).get(Color()));
Real s((*scalar)(t).get(Real()));
ret.set_r(ret.get_r()*s);
Color ret((*value_node)(t).get(Color()));
Real s((*scalar)(t).get(Real()));
ret.set_r(ret.get_r()*s);
- ret.set_g(ret.get_
r
()*s);
- ret.set_b(ret.get_
r
()*s);
+ ret.set_g(ret.get_
g
()*s);
+ ret.set_b(ret.get_
b
()*s);
return ret;
}
return ret;
}