X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftimepointcollect.cpp;h=c395dfd06e2697f7b002cc9287eede2c4f98ec84;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=abbfc76c17b38f98c63cbf76e23969ce1c7c89ac;hpb=31bab200aa3a0800c44197b0b41be7cfafdd8da7;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp index abbfc76..c395dfd 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.cpp +++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -54,7 +55,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 +73,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 +87,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 +126,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(...) @@ -146,7 +146,7 @@ synfig::activepoint_collect(set >& /*activepoin const TimePointSet& timepoint_set(node->get_times()); // Check to see if there is anything in here at the given time - if(timepoint_set.find(time)==timepoint_set.end()); + if(timepoint_set.find(time)==timepoint_set.end()) return 0; return 0;