X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_add.cpp;h=9f83229fa27574cd098880fdadc8884484210c46;hb=8855fdd4a26f69afaa5a018c6eb9cfc770f0c09d;hp=172b305f80784a70894c303c82c137f511e89039;hpb=ac681f880251765bcd7ac3b244863895b3b8eef3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_add.cpp b/synfig-core/trunk/src/synfig/valuenode_add.cpp index 172b305..9f83229 100644 --- a/synfig-core/trunk/src/synfig/valuenode_add.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_add.cpp @@ -38,6 +38,7 @@ #include "vector.h" #include "angle.h" #include "real.h" +#include #endif @@ -173,11 +174,7 @@ synfig::ValueNode_Add::operator()(Time t)const case ValueBase::TYPE_COLOR: return ((*ref_a)(t).get(Color())+(*ref_b)(t).get(Color()))*(*scalar)(t).get(Real()); case ValueBase::TYPE_INTEGER: - { - Real ret = ((*ref_a)(t).get(int())+(*ref_b)(t).get(int()))*(*scalar)(t).get(Real()) + 0.5f; - if (ret < 0) return static_cast(ret-1); - return static_cast(ret); - } + return round_to_int(((*ref_a)(t).get(int())+(*ref_b)(t).get(int()))*(*scalar)(t).get(Real())); case ValueBase::TYPE_REAL: return ((*ref_a)(t).get(Vector::value_type())+(*ref_b)(t).get(Vector::value_type()))*(*scalar)(t).get(Real()); case ValueBase::TYPE_TIME: