From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Mon, 3 Sep 2007 10:52:08 +0000 (+0000)
Subject: Partially fix 1785296: Allow waypoints to refer to canvases, for example: <waypoint... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=3baa4dddbc86fad8a40e89fb4415c0cd68a79da7;p=synfig.git

Partially fix 1785296: Allow waypoints to refer to canvases, for example: <waypoint time="1s" use="canvas1"/>


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

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 6bbefc0..37d1e3f 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -901,10 +901,22 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 
 
 			ValueNode::Handle waypoint_value_node;
+			xmlpp::Element::NodeList list = child->get_children();
 
 			if(child->get_attribute("use"))
 			{
-				waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value());
+				if(!list.empty())
+					warning(child,_("Found \"use\" attribute for <waypoint>, but it wasn't empty. Ignoring contents..."));
+
+				// the waypoint might look like this, in which case we won't find "mycanvas" in the list of valuenodes, 'cos it's a canvas
+				//
+				//      <animated type="canvas">
+				//        <waypoint time="0s" use="mycanvas"/>
+				//      </animated>
+				if (type==ValueBase::TYPE_CANVAS)
+					waypoint_value_node=ValueNode_Const::create(canvas->surefind_canvas(child->get_attribute("use")->get_value()));
+				else
+					waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value());
 			}
 			else
 			{
@@ -914,7 +926,6 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 					continue;
 				}
 
-				xmlpp::Element::NodeList list = child->get_children();
 				xmlpp::Element::NodeList::iterator iter;
 
 				// Search for the first non-text XML element
@@ -1678,6 +1689,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas)
 
 			if(child->get_attribute("use"))
 			{
+				// \todo does this need to be able to read 'use="canvas"', like waypoints can now?  (see 'surefind_canvas' in this file)
 				string id=child->get_attribute("use")->get_value();
 				try
 				{