X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftimepointcollect.cpp;h=abbfc76c17b38f98c63cbf76e23969ce1c7c89ac;hb=31bab200aa3a0800c44197b0b41be7cfafdd8da7;hp=3a6a74a2516d253fbc67a84f5aee1236e3747456;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp
index 3a6a74a..abbfc76 100644
--- a/synfig-core/trunk/src/synfig/timepointcollect.cpp
+++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp
@@ -31,6 +31,7 @@
 
 #include "timepointcollect.h"
 #include "valuenode_animated.h"
+#include "layer_pastecanvas.h"
 #include "layer.h"
 #include "canvas.h"
 #include "value.h"
@@ -90,7 +91,13 @@ synfig::waypoint_collect(set<Waypoint, std::less<UniqueID> >& waypoint_set,const
 		ValueBase canvas_value(layer->get_param("canvas"));
 		if(canvas_value.get_type()==ValueBase::TYPE_CANVAS)
 		{
-			ret+=waypoint_collect(waypoint_set,time,Canvas::Handle(canvas_value.get(Canvas::Handle())));
+			etl::handle<Layer_PasteCanvas> p = etl::handle<Layer_PasteCanvas>::cast_dynamic(layer);
+			if (p)
+				ret+=waypoint_collect(waypoint_set, time + p->get_time_offset(),
+									  Canvas::Handle(canvas_value.get(Canvas::Handle())));
+			else
+				ret+=waypoint_collect(waypoint_set, time,
+									  Canvas::Handle(canvas_value.get(Canvas::Handle())));
 		}
 		return ret;
 	}
@@ -134,7 +141,7 @@ synfig::waypoint_collect(set<Waypoint, std::less<UniqueID> >& waypoint_set,const
 
 //! \writeme
 int
-synfig::activepoint_collect(set<Activepoint, std::less<UniqueID> >& activepoint_set,const Time& time, const etl::handle<Node>& node)
+synfig::activepoint_collect(set<Activepoint, std::less<UniqueID> >& /*activepoint_set*/,const Time& time, const etl::handle<Node>& node)
 {
 	const TimePointSet& timepoint_set(node->get_times());