X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=6cdd09f94006933a436a7fc72f19b4a99187bf8f;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;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..6cdd09f 100644 --- a/synfig-core/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/src/synfig/layer_pastecanvas.cpp @@ -92,6 +92,9 @@ Layer_PasteCanvas::Layer_PasteCanvas(): children_lock=false; muck_with_time_=true; curr_time=Time::begin(); + Layer::Vocab voc(get_param_vocab()); + Layer::fill_static(voc); + set_param_static("children_lock", true); } Layer_PasteCanvas::~Layer_PasteCanvas() @@ -178,9 +181,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 +568,17 @@ 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) +{ + return Layer_Composite::set_param_static(param, x); +} + + +bool +Layer_PasteCanvas::get_param_static(const String ¶m) const +{ + return Layer_Composite::get_param_static(param); +}