X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=ede95013805a50094d765d636d533eadd4ba174e;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=4d734ec379e383d393ce71ca2bda08b3fb30e638;hpb=a844921624f813ecafac3f34104c1078b9e375f2;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 4d734ec..ede9501 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -69,8 +69,9 @@ int _CanvasCounter::counter(0);
 
 /* === M E T H O D S ======================================================= */
 
-Canvas::Canvas(const string &id):
+Canvas::Canvas(const String &id):
 	id_			(id),
+	version_	(CURRENT_CANVAS_VERSION),
 	cur_time_	(0),
 	is_inline_	(false),
 	is_dirty_	(true),
@@ -91,7 +92,6 @@ Canvas::~Canvas()
 {
 	//if(is_inline() && parent_) assert(0);
 	_CanvasCounter::counter--;
-	//DEBUGPOINT();
 	clear();
 	begin_delete();
 }
@@ -412,7 +412,6 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id)
 		return parent_->add_value_node(x,id);
 //		throw runtime_error("You cannot add a ValueNode to an inline Canvas");
 
-	//DEBUGPOINT();
 	if(x->is_exported())
 		throw runtime_error("ValueNode is already exported");
 
@@ -424,16 +423,13 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id)
 
 	try
 	{
-		//DEBUGPOINT();
 		if(PlaceholderValueNode::Handle::cast_dynamic(value_node_list_.find(id)))
 			throw Exception::IDNotFound("add_value_node()");
 
-		//DEBUGPOINT();
 		throw Exception::IDAlreadyExists(id);
 	}
 	catch(Exception::IDNotFound)
 	{
-		//DEBUGPOINT();
 		x->set_id(id);
 
 		x->set_parent_canvas(this);
@@ -443,7 +439,6 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id)
 			synfig::error("Unable to add ValueNode");
 			throw std::runtime_error("Unable to add ValueNode");
 		}
-		//DEBUGPOINT();
 
 		return;
 	}
@@ -663,7 +658,6 @@ Canvas::create()
 void
 Canvas::push_back(etl::handle<Layer> x)
 {
-//	DEBUGPOINT();
 //	int i(x->count());
 	insert(end(),x);
 	//if(x->count()!=i+1)synfig::info("push_back before %d, after %d",i,x->count());
@@ -672,7 +666,6 @@ Canvas::push_back(etl::handle<Layer> x)
 void
 Canvas::push_front(etl::handle<Layer> x)
 {
-//	DEBUGPOINT();
 //	int i(x->count());
 	insert(begin(),x);
 	//if(x->count()!=i+1)synfig::error("push_front before %d, after %d",i,x->count());
@@ -734,7 +727,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));
@@ -777,7 +770,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());
 	}
 
@@ -1013,6 +1010,11 @@ Canvas::get_meta_data_keys()const
 	return ret;
 }
 
+/* note - the "Motion Blur" and "Duplicate" layers need the dynamic
+		  parameters of any PasteCanvas layers they loop over to be
+		  maintained.  When the variables in the following function
+		  refer to "motion blur", they mean either of these two
+		  layers. */
 void
 synfig::optimize_layers(Context context, Canvas::Handle op_canvas, bool seen_motion_blur_in_parent)
 {
@@ -1041,7 +1043,7 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas, bool seen_mot
 			if(value.get_type()==ValueBase::TYPE_REAL && value.get(Real())==0)
 				continue;
 
-			if(layer->get_name()=="MotionBlur")
+			if(layer->get_name()=="MotionBlur" || layer->get_name()=="duplicate")
 			{
 				float z_depth(layer->get_z_depth()*1.0001+i);
 
@@ -1254,13 +1256,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)