X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=690277cf630f1af91daeac96aab832d038cf19f8;hb=2bcfb246cd9568429230b0c996a26e8deebda348;hp=6129f7120f9a18805f09fe182e1c97986fa91f3f;hpb=1cc17a4ac143e337dc4bb2b1d9514a085bced7af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 6129f71..690277c 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -96,7 +96,7 @@ xmlpp::Element* encode_real(xmlpp::Element* root,Real v)
 	return root;
 }
 
-xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float fps=0)
+xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float /*fps*/=0)
 {
 	root->set_name("time");
  	//root->set_attribute("value",t.get_string(fps));
@@ -268,8 +268,18 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 		//waypoint_node->add_child(encode_value(iter->get_value(),canvas));
 		if(iter->get_value_node()->is_exported())
 			waypoint_node->set_attribute("use",iter->get_value_node()->get_relative_id(canvas));
-		else
-			encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+		else {
+			ValueNode::ConstHandle value_node = iter->get_value_node();
+			if(ValueNode_Const::ConstHandle::cast_dynamic(value_node)) {
+				const ValueBase data = ValueNode_Const::ConstHandle::cast_dynamic(value_node)->get_value();
+				if (data.get_type() == ValueBase::TYPE_CANVAS)
+					waypoint_node->set_attribute("use",data.get(Canvas::Handle()).get()->get_relative_id(canvas));
+				else
+					encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+			}
+			else
+				encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+		}
 
 		switch(iter->get_before())
 		{