X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=eaa90627fa8607ee7324a35e1ea2232a958f8d23;hb=b177280b8815c394cb67c713eb34260ebb72de94;hp=739cf7ee55325c164460c60908cee7d74cb4764e;hpb=0a7bcee76abd2190abf30196d21641b2d799e2fc;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 739cf7e..eaa9062 100644
--- 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
@@ -68,7 +69,7 @@ int _CanvasCounter::counter(0);
 
 /* === M E T H O D S ======================================================= */
 
-Canvas::Canvas(const string &id):
+Canvas::Canvas(const String &id):
 	id_			(id),
 	cur_time_	(0),
 	is_inline_	(false),
@@ -733,7 +734,7 @@ Canvas::push_back_simple(etl::handle<Layer> x)
 }
 
 void
-Canvas::erase(Canvas::iterator iter)
+Canvas::erase(iterator iter)
 {
 	if(!(*iter)->get_group().empty())
 		remove_group_pair((*iter)->get_group(),(*iter));
@@ -768,7 +769,7 @@ Canvas::clone(const GUID& deriv_guid)const
 	{
 		name=get_id()+"_CLONE";
 
-		throw runtime_error("Cloning of non-inline canvases is not yet suported");
+		throw runtime_error("Cloning of non-inline canvases is not yet supported");
 	}
 
 	Handle canvas(new Canvas(name));
@@ -776,7 +777,11 @@ Canvas::clone(const GUID& deriv_guid)const
 	if(is_inline())
 	{
 		canvas->is_inline_=true;
-		canvas->parent_=0;
+		// \todo this was setting parent_=0 - is there a reason for that?
+		// this was causing bug 1838132, where cloning an inline canvas that contains an imported image fails
+		// it was failing to ascertain the absolute pathname of the imported image, since it needs the pathname
+		// of the canvas to get that, which is stored in the parent canvas
+		canvas->parent_=parent();
 		//canvas->set_inline(parent());
 	}
 
@@ -1018,10 +1023,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 +1085,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,
@@ -1250,13 +1258,13 @@ Canvas::remove_group_pair(String group, etl::handle<Layer> layer)
 }
 
 void
-Canvas::add_connection(Layer::LooseHandle layer, sigc::connection connection)
+Canvas::add_connection(etl::loose_handle<Layer> layer, sigc::connection connection)
 {
 	connections_[layer].push_back(connection);
 }
 
 void
-Canvas::disconnect_connections(Layer::LooseHandle layer)
+Canvas::disconnect_connections(etl::loose_handle<Layer> layer)
 {
 	std::vector<sigc::connection>::iterator iter;
 	for(iter=connections_[layer].begin();iter!=connections_[layer].end();++iter)