X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=f8006e44d545b6b17ecdf26ba4e279f4f47d0e71;hb=843ac7146b30c389db9123564d0727b71c64def2;hp=e5fee0d3fe137b29364e7fd134b33a1e2a99a57b;hpb=ab0fdd8b55ca3586f49178b2fd641573f936481e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index e5fee0d..f8006e4 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -144,6 +144,18 @@ Layer_PasteCanvas::get_param_vocab()const
 		.set_local_name(_("Children Lock"))
 	);
 
+	// optimize_layers() in canvas.cpp makes a new PasteCanvas layer
+	// and copies over the parameters of the old layer.  the
+	// 'curr_time' member wasn't being copied, so I've added it as a
+	// hidden, non critical parameter, and now it will be.  this
+	// allows a single exported subcanvas to be used more than once at
+	// a time, with different time offets in each.  see bug #1896557.
+	ret.push_back(ParamDesc("curr_time")
+		.set_local_name(_("Current Time"))
+		.not_critical()
+		.hidden()
+	);
+
 	return ret;
 }
 
@@ -183,6 +195,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 
 	IMPORT(children_lock);
 	IMPORT(zoom);
+	IMPORT(curr_time);
 
 	return Layer_Composite::set_param(param,value);
 }
@@ -199,6 +212,8 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 
 	child_changed_connection.disconnect();
 
+	if (canvas != x) signal_subcanvas_changed()();
+
 	canvas=x;
 
 	/*if(canvas)
@@ -228,6 +243,24 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 		on_canvas_set();
 }
 
+// when a pastecanvas that contains another pastecanvas is copy/pasted
+// from one document to another, only the outermost pastecanvas was
+// getting its renddesc set to match that of its new parent.  this
+// function is used to recurse through the pastecanvas copying its
+// renddesc to any pastecanvases it contains (bug #2116947, svn r2200)
+void
+Layer_PasteCanvas::update_renddesc()
+{
+	if(!get_canvas() || !canvas || !canvas->is_inline()) return;
+
+	canvas->rend_desc()=get_canvas()->rend_desc();
+	for (Context context = canvas->get_context(); !context->empty(); context++)
+	{
+		etl::handle<Layer_PasteCanvas> paste = etl::handle<Layer_PasteCanvas>::cast_dynamic(*context);
+		if (paste) paste->update_renddesc();
+	}
+}
+
 // This is called whenever the parent canvas gets set/changed
 void
 Layer_PasteCanvas::on_canvas_set()
@@ -249,6 +282,7 @@ Layer_PasteCanvas::get_param(const String& param)const
 	EXPORT(zoom);
 	EXPORT(time_offset);
 	EXPORT(children_lock);
+	EXPORT(curr_time);
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
@@ -322,9 +356,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	if(!canvas || !get_amount())
 		return context.accelerated_render(surface,quality,renddesc,cb);
 
-	if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
-		canvas->set_time(curr_time+time_offset);
-
 	SuperCallback stageone(cb,0,4500,10000);
 	SuperCallback stagetwo(cb,4500,9000,10000);
 	SuperCallback stagethree(cb,9000,9999,10000);
@@ -344,6 +375,9 @@ 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)
+		canvas->set_time(curr_time+time_offset);
+
 	Color::BlendMethod blend_method(get_blend_method());
 	const Rect full_bounding_rect(canvas->get_context().get_full_bounding_rect());
 
@@ -379,10 +413,12 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 		if (blend_method==Color::BLEND_COMPOSITE) blend_using_straight = true;
 	}
 
-	if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
+	if (!etl::intersect(context.get_full_bounding_rect(),(full_bounding_rect*exp(zoom))+origin))
 	{
-		// if there's no intersection between the context and our surface, and we're rendering 'onto', then we're done
-		if (Color::is_onto(blend_method)) return true;
+		// if there's no intersection between the context and our
+		// surface, and we're rendering 'onto', then we're done
+		if (Color::is_onto(blend_method) && !Color::is_straight(blend_method))
+			return true;
 
 		/* 'straight' is faster than 'composite' and has the same
 		 * effect if the affected area of the lower layer is