My recent fix for trailing spaces left out spaces when the fps is zero.

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

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index ce19988..c59075e 100644 (file)
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -1062,11 +1062,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
        // waypoint's value
        if (type == ValueBase::TYPE_ANGLE) 
        {
-               Canvas::Handle parent = canvas;
-               while (!parent->is_root())
-                       parent = parent->parent();
-
-               if (parent->get_version() == "0.1")
+               if (canvas->get_version() == "0.1")
                {
                        bool first = true;
                        Real angle, prev = 0;
@@ -1077,6 +1073,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
                                if (first)
                                        first = false;
                                else if (iter->get_value_node()->get_name() == "constant")
+                               {
                                        if (angle - prev > 180)
                                        {
                                                while (angle - prev > 180) angle -= 360;
@@ -1087,6 +1084,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
                                                while (prev - angle > 180) angle += 360;
                                                iter->set_value(Angle::deg(angle));
                                        }
+                               }
                                prev = angle;
                        }
                }
@@ -1832,6 +1830,8 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 
        if(element->get_attribute("version"))
                canvas->set_version(element->get_attribute("version")->get_value());
+       else if(parent)
+               canvas->set_version(parent->get_version());
 
        if(element->get_attribute("width"))
                canvas->rend_desc().set_w(atoi(element->get_attribute("width")->get_value().c_str()));