X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=0ab0735470beb5d91561879c9acd567f2d6e6cf6;hb=8855fdd4a26f69afaa5a018c6eb9cfc770f0c09d;hp=b2f62b79b0fe4e116a14b9b577eaeb70f6a7b019;hpb=ac681f880251765bcd7ac3b244863895b3b8eef3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp index b2f62b7..0ab0735 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp @@ -39,6 +39,7 @@ #include "vector.h" #include "time.h" #include "angle.h" +#include #endif @@ -176,11 +177,7 @@ synfig::ValueNode_Scale::operator()(Time t)const return ret; } else if(get_type()==ValueBase::TYPE_INTEGER) - { - Real ret = (*value_node)(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((*value_node)(t).get(int())*(*scalar)(t).get(Real())); else if(get_type()==ValueBase::TYPE_REAL) return (*value_node)(t).get(Real())*(*scalar)(t).get(Real()); else if(get_type()==ValueBase::TYPE_TIME)