X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=242339272c571786be757256bb44ef926f656c83;hb=463ee5de2f498c86ffa7ad30f851729da621c908;hp=572aee29f1d268f3dfbedb3fd6620b6f9985c83f;hpb=0b5ca455eae12998cf1f0cbd17c5dd3db8550411;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 572aee2..2423392 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -241,6 +241,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()
@@ -395,8 +413,10 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
 	if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+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