X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=1eea2e9f1b7de0870b028db935feed5d43931fa8;hb=6612ced05a48e176c5bc9e291152b5d8ae4fbf38;hp=cd615066cee89471821c805a98914fd5c4f45584;hpb=2aa82e84160499903d3e7f85a7770ffe3d04ddb2;p=synfig.git diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp index cd61506..1eea2e9 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; @@ -178,9 +184,9 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) if(param=="canvas" && value.same_type_as(Canvas::Handle())) { set_sub_canvas(value.get(Canvas::Handle())); + set_param_static(param, value.get_static()); return true; } - //! \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 @@ -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(time_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(time_offset) + GET_STATIC(children_lock) + + return Layer_Composite::get_param_static(param); +}