From 470708cb3278175cd21694d2317f92f83bbd28cd Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 9 Feb 2008 00:00:44 +0000 Subject: [PATCH] Tidying. git-svn-id: http://svn.voria.com/code@1630 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/timepointcollect.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp index 7d857d8..5f7912a 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.cpp +++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp @@ -54,7 +54,9 @@ using namespace synfig; //! \writeme int -synfig::waypoint_collect(set >& waypoint_set,const Time& time, const etl::handle& node) +synfig::waypoint_collect(set > &waypoint_set, + const Time &time, + const etl::handle &node) { const TimePointSet& timepoint_set(node->get_times()); @@ -70,9 +72,8 @@ synfig::waypoint_collect(set >& waypoint_set,const const int link_count(linkable_value_node->link_count()); int i,ret(0); for(i=0;iget_link(i).get()); - } + return ret; } @@ -85,9 +86,8 @@ synfig::waypoint_collect(set >& waypoint_set,const Layer::DynamicParamList::const_iterator iter; int ret(0); for(iter=dyn_param_list.begin();iter!=dyn_param_list.end();++iter) - { ret+=waypoint_collect(waypoint_set,time,iter->second); - } + ValueBase canvas_value(layer->get_param("canvas")); if(canvas_value.get_type()==ValueBase::TYPE_CANVAS) { @@ -125,9 +125,8 @@ synfig::waypoint_collect(set >& waypoint_set,const // If it is already in the waypoint set, then // don't bother adding it again if(waypoint_set.find(waypoint)!=waypoint_set.end()) - { return 0; - } + waypoint_set.insert(waypoint); return 1; }catch(...) -- 2.7.4