**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007, 2008 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
.set_local_name(_("Children Lock"))
);
+ // optimize_layers() in canvas.cpp makes a new PasteCanvas layer
+ // and copies over the parameters of the old layer. the
+ // 'curr_time' member wasn't being copied, so I've added it as a
+ // hidden, non critical parameter, and now it will be. this
+ // allows a single exported subcanvas to be used more than once at
+ // a time, with different time offets in each. see bug #1896557.
+ ret.push_back(ParamDesc("curr_time")
+ .set_local_name(_("Current Time"))
+ .not_critical()
+ .hidden()
+ );
+
return ret;
}
return true;
}
- //! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+ //! \todo this introduces bug 1844764 if enabled; it was introduced in r954.
+ // http://synfig.org/images/3/3d/Moving-waypoints.sifz is an
+ // example of an animation that has its waypoints displayed
+ // incorrectly without this fix; select the outer layer and drag
+ // the time slider. The linear waypoints don't take effect until
+ // 5s, but the time slider appears to pass the first one at 3s.
#if 0
if (param=="time_offset" && value.same_type_as(time_offset))
{
IMPORT(children_lock);
IMPORT(zoom);
+ IMPORT(curr_time);
return Layer_Composite::set_param(param,value);
}
EXPORT(zoom);
EXPORT(time_offset);
EXPORT(children_lock);
+ EXPORT(curr_time);
EXPORT_NAME();
EXPORT_VERSION();
if(!canvas || !get_amount())
return context.accelerated_render(surface,quality,renddesc,cb);
- if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
- canvas->set_time(curr_time+time_offset);
-
SuperCallback stageone(cb,0,4500,10000);
SuperCallback stagetwo(cb,4500,9000,10000);
SuperCallback stagethree(cb,9000,9999,10000);
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)
+ canvas->set_time(curr_time+time_offset);
+
Color::BlendMethod blend_method(get_blend_method());
const Rect full_bounding_rect(canvas->get_context().get_full_bounding_rect());