X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=1857db208ce5b3985fae0db272a4465c1aee7f83;hb=4f7ed97f65e0e42ebec5fa0abe76bc2c9bd6c280;hp=f8308a7b287e86baae02206b211c9b2c541c6afc;hpb=54e728383905c50f871c96fd44801e5321e8c0c9;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index f8308a7..1857db2 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -410,14 +410,17 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const Node::time_set tset; if(canvas) tset = canvas->get_times(); - Node::time_set::iterator i = tset.begin(), - end = tset.end(); + Node::time_set::iterator i = tset.begin(), end = tset.end(); //Make sure we offset the time... - //TODO: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION - // (recursing down the tree needs to take this into account too...) + //! \todo: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION + // (recursing down the tree needs to take this into account too...) for(; i != end; ++i) - set.insert(*i - time_offset); + set.insert(*i +#ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET // see node.h + - time_offset +#endif + ); Layer::get_times_vfunc(set); }