X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=6cdd09f94006933a436a7fc72f19b4a99187bf8f;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;hp=3fafb8ed6076071b6e76ebb666f86b79e594b368;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git

diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp
index 3fafb8e..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
@@ -274,13 +277,10 @@ Layer_PasteCanvas::update_renddesc()
 void
 Layer_PasteCanvas::on_canvas_set()
 {
-	//synfig::info("before count()=%d",count());
 	if(get_canvas() && canvas && canvas->is_inline() && canvas->parent()!=get_canvas())
 	{
-		//synfig::info("during count()=%d",count());
 		canvas->set_inline(get_canvas());
 	}
-	//synfig::info("after count()=%d",count());
 }
 
 ValueBase
@@ -385,7 +385,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());
@@ -568,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 &param, const bool x)
+{
+	return Layer_Composite::set_param_static(param, x);
+}
+
+
+bool
+Layer_PasteCanvas::get_param_static(const String &param) const
+{
+	return Layer_Composite::get_param_static(param);
+}