From: Carlos Lopez Date: Fri, 16 Jul 2010 16:52:56 +0000 (+0200) Subject: Fix bug #3029832 Time Offset parameter fails for multiple times imported files. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d31464d31c113c1ffbe91cdcae4a0429f1e472e0;p=synfig.git Fix bug #3029832 Time Offset parameter fails for multiple times imported files. canvas->set time not only sets the time but also calls the canvas's context set_time. There are bugs pending though. Live play produces bad renders on canvas window. Output render is fine now. --- diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp index 3fafb8e..c79c8f0 100644 --- a/synfig-core/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/src/synfig/layer_pastecanvas.cpp @@ -385,7 +385,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali else if (!context.accelerated_render(surface,quality,renddesc,&stageone)) return false; - if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset) + if(muck_with_time_ && curr_time!=Time::begin() /*&& canvas->get_time()!=curr_time+time_offset*/) canvas->set_time(curr_time+time_offset); Color::BlendMethod blend_method(get_blend_method());