X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=edc3d0b6b6fbada291cd657ca250fe6ffc0e06a0;hb=3f11cd07d0b39fbd614ca1f8b0eb903dc5571fc8;hp=d34353066633730cc180ae80caca1f5c38c57a0c;hpb=a50de53f5e4b23b1e3c0d79866a8503758422dba;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index d343530..edc3d0b 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -85,7 +85,8 @@ Layer_PasteCanvas::Layer_PasteCanvas():
 	origin(0,0),
 	depth(0),
 	zoom(0),
-	time_offset(0)
+	time_offset(0),
+	extra_reference(false)
 {
 	children_lock=false;
 	muck_with_time_=true;
@@ -103,6 +104,7 @@ Layer_PasteCanvas::~Layer_PasteCanvas()
 	set_sub_canvas(0);
 
 	//if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+	//if(extra_reference)
 	//	canvas->unref();
 }
 
@@ -186,7 +188,8 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 	if(canvas && muck_with_time_)
 		remove_child(canvas.get());
 
-	if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+	// if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+	if (extra_reference)
 		canvas->unref();
 
 	child_changed_connection.disconnect();
@@ -209,7 +212,12 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 		add_child(canvas.get());
 
 	if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+	{
 		canvas->ref();
+		extra_reference = true;
+	}
+	else
+		extra_reference = false;
 
 	if(canvas)
 		on_canvas_set();
@@ -392,13 +400,19 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	// 'straight', then we need to blend transparent pixels with the
 	// clipped areas of this tile, because with the 'straight' blend
 	// method, even transparent pixels have an effect on the layers below
-	if (blend_method == Color::BLEND_STRAIGHT)
+	if (Color::is_straight(blend_method))
 	{
 		Surface clearsurface;
 
 		Surface::alpha_pen apen(surface->begin());
 		apen.set_alpha(get_amount());
-		apen.set_blend_method(Color::BLEND_STRAIGHT);
+
+		// the area we're about to blit is transparent, so it doesn't
+		// matter whether we use 'straight' or 'straight onto' here
+		if (blend_method == Color::BLEND_ALPHA_BRIGHTEN)
+			apen.set_blend_method(blend_method);
+		else
+			apen.set_blend_method(Color::BLEND_STRAIGHT);
 
 		/* This represents the area we're pasting into the tile,
 		 * within the tile as a whole.	Areas (A), (B), (C) and (D)