From: dooglus Date: Sat, 22 Nov 2008 15:32:23 +0000 (+0000) Subject: Explicitly call get_list() when converting a bline's valuenode at a particular time... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5aa0b92e2867e41eb43dc62c9771323281e911fe;p=synfig.git Explicitly call get_list() when converting a bline's valuenode at a particular time to a vector of ValueBase objects. This is needed since the next revision will introduce an ambiguity by allowing ValueBase objects to be cast to type Real, which in turn can be cast to type size_t which can be used as an argument to the std::vector constructor. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2233 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp index 67c1775..74b4b57 100644 --- a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp @@ -90,7 +90,7 @@ ValueNode_BLineCalcTangent::~ValueNode_BLineCalcTangent() ValueBase ValueNode_BLineCalcTangent::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; diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp index 7109f32..e32d9bc 100644 --- a/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp @@ -87,7 +87,7 @@ ValueNode_BLineCalcVertex::~ValueNode_BLineCalcVertex() ValueBase ValueNode_BLineCalcVertex::operator()(Time t)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; diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp index bfb291b..b754f2f 100644 --- a/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp @@ -88,7 +88,7 @@ ValueNode_BLineCalcWidth::~ValueNode_BLineCalcWidth() ValueBase 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; diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp index ef5ba36..0193bf3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp @@ -165,7 +165,7 @@ Action::ValueDescBLineLink::prepare() ValueNode_DynamicList::Handle bline_value_node(ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())); bool loop(bline_value_node->get_loop()); int loop_adjust(loop ? 0 : -1); - const std::vector bline((*bline_value_node)(time)); + const std::vector bline((*bline_value_node)(time).get_list()); int size = bline.size(); Real amount = (index + origin + loop_adjust) / (size + loop_adjust); LinkableValueNode::Handle calculated_value_node;