Add my copyright to files I've modified.

[synfig.git] / synfig-core / trunk / src / synfig / canvas.cpp

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 739cf7e..1d54730 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -1018,10 +1019,10 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas, bool seen_mot
        Context iter;
 
        std::vector< std::pair<float,Layer::Handle> > sort_list;
-       int i, motion_blur_i;           // motion_blur_i is for resolving which layer comes first in the event of a z_depth tie
-       float motion_blur_z_depth;      // the z_depth of the least deep motion blur layer in this context
+       int i, motion_blur_i=0; // motion_blur_i is for resolving which layer comes first in the event of a z_depth tie
+       float motion_blur_z_depth=0; // the z_depth of the least deep motion blur layer in this context
        bool seen_motion_blur_locally = false;
-       bool motion_blurred;            // the final result - is this layer blurred or not?
+       bool motion_blurred; // the final result - is this layer blurred or not?
 
        // If the parent didn't cause us to already be motion blurred,
        // check whether there's a motion blur in this context,
@@ -1080,7 +1081,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,