From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Wed, 3 Oct 2007 12:31:16 +0000 (+0000)
Subject: Fix #1806852: sort PasteCanvas layers by z-depth even if they do have a non-zero... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d3187b0a5a28aa2e07d68b415bc21e2df5ce9791;p=synfig.git

Fix #1806852: sort PasteCanvas layers by z-depth even if they do have a non-zero time offset.


git-svn-id: http://svn.voria.com/code@826 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 739cf7e..11d84a3 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -1080,7 +1080,10 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas, bool seen_mot
 			continue;
 
 		Layer_PasteCanvas* paste_canvas(static_cast<Layer_PasteCanvas*>(layer.get()));
-		if(layer->get_name()=="PasteCanvas" && paste_canvas->get_time_offset()==0)
+
+		// note: this used to include "&& paste_canvas->get_time_offset()==0", but then
+		//		 time-shifted layers weren't being sorted by z-depth (bug #1806852)
+		if(layer->get_name()=="PasteCanvas")
 		{
 			// we need to blur the sub canvas if:
 			// our parent is blurred,