X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_blinecalcwidth.cpp;h=b754f2f29c90e6c787eb9bc900294ba890312d9e;hb=5aa0b92e2867e41eb43dc62c9771323281e911fe;hp=1e50ae963a25b48842b2b2b7626a08010b6e015e;hpb=9ba45afbd8f5d19b0e4cad3159888df9940e613a;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp index 1e50ae9..b754f2f 100644 --- a/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp @@ -86,14 +86,13 @@ ValueNode_BLineCalcWidth::~ValueNode_BLineCalcWidth() } ValueBase -ValueNode_BLineCalcWidth::operator()(Time t)const +ValueNode_BLineCalcWidth::operator()(Time t, Real amount)const { - const std::vector bline((*bline_)(t)); + const std::vector bline((*bline_)(t).get_list()); handle bline_value_node(bline_); const bool looped(bline_value_node->get_loop()); int size = bline.size(), from_vertex; bool loop((*loop_)(t).get(bool())); - Real amount((*amount_)(t).get(Real())); Real scale((*scale_)(t).get(Real())); BLinePoint blinepoint0, blinepoint1; @@ -125,6 +124,13 @@ ValueNode_BLineCalcWidth::operator()(Time t)const return Real((width0 + (amount-from_vertex) * (width1-width0)) * scale); } +ValueBase +ValueNode_BLineCalcWidth::operator()(Time t)const +{ + Real amount((*amount_)(t).get(Real())); + return (*this)(t, amount); +} + String ValueNode_BLineCalcWidth::get_name()const {