X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=733e7fe655625f4fd459fb8f494d19bc305d3a97;hb=e0d9bcc7f95c8f0782f03b17ad10e008f573acb3;hp=04153c57e4907259fc4628b2f20b90f7a1417b87;hpb=7dff27207f160d59ff91b92f5176707090ca26bd;p=synfig.git diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp index 04153c5..733e7fe 100644 --- a/synfig-core/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/src/synfig/layer_pastecanvas.cpp @@ -87,7 +87,13 @@ Layer_PasteCanvas::Layer_PasteCanvas(): depth(0), zoom(0), time_offset(0), - extra_reference(false) + extra_reference(false), + origin_static(false), + focus_static(false), + canvas_static(false), + zoom_static(false), + offset_static(false), + children_lock_static(true) { children_lock=false; muck_with_time_=true; @@ -382,7 +388,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()); @@ -565,3 +571,31 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const Layer::get_times_vfunc(set); } + + +bool +Layer_PasteCanvas::set_param_static(const String ¶m, const bool x) +{ + SET_STATIC(origin, x) + SET_STATIC(focus, x) + SET_STATIC(canvas, x) + SET_STATIC(zoom, x) + SET_STATIC(offset, x) + SET_STATIC(children_lock, x) + + return Layer_Composite::set_param_static(param, x); +} + + +bool +Layer_PasteCanvas::get_param_static(const String ¶m) const +{ + GET_STATIC(origin) + GET_STATIC(focus) + GET_STATIC(canvas) + GET_STATIC(zoom) + GET_STATIC(offset) + GET_STATIC(children_lock) + + return Layer_Composite::get_param_static(param); +}