Merge branch 'genete_static_values'

[synfig.git] / synfig-core / src / synfig / layer_pastecanvas.cpp

diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp
index 733e7fe..6cdd09f 100644 (file)
--- a/synfig-core/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/src/synfig/layer_pastecanvas.cpp
@@ -87,17 +87,14 @@ Layer_PasteCanvas::Layer_PasteCanvas():
        depth(0),
        zoom(0),
        time_offset(0),
-       extra_reference(false),
-       origin_static(false),
-       focus_static(false),
-       canvas_static(false),
-       zoom_static(false),
-       offset_static(false),
-       children_lock_static(true)
+       extra_reference(false)
 {
        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()
@@ -184,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
@@ -576,13 +573,6 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
 bool
 Layer_PasteCanvas::set_param_static(const String &param, 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);
 }
 
@@ -590,12 +580,5 @@ Layer_PasteCanvas::set_param_static(const String &param, const bool x)
 bool
 Layer_PasteCanvas::get_param_static(const String &param) 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);
 }