{get,set}_time_tension() were the same as {get,set}_temporal_tension() - use the...

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

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 402c0e0..1282601 100644 (file)
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -995,7 +995,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
                        if(child->get_attribute("temporal-tension"))
                        {
                                synfig::String str(child->get_attribute("temporal-tension")->get_value());
-                               waypoint->set_time_tension(atof(str.c_str()));
+                               waypoint->set_temporal_tension(atof(str.c_str()));
                        }
                        if(child->get_attribute("continuity"))
                        {

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index b68e9cb..a2ae0d9 100644 (file)
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -333,8 +333,8 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 
                if(iter->get_tension()!=0.0)
                        waypoint_node->set_attribute("tension",strprintf("%f",iter->get_tension()));
-               if(iter->get_time_tension()!=0.0)
-                       waypoint_node->set_attribute("temporal-tension",strprintf("%f",iter->get_time_tension()));
+               if(iter->get_temporal_tension()!=0.0)
+                       waypoint_node->set_attribute("temporal-tension",strprintf("%f",iter->get_temporal_tension()));
                if(iter->get_continuity()!=0.0)
                        waypoint_node->set_attribute("continuity",strprintf("%f",iter->get_continuity()));
                if(iter->get_bias()!=0.0)

diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
index f281515..c2a32fc 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
@@ -491,8 +491,8 @@ public:
                        curve.first.set_rs(iter->get_time(), next->get_time());
                        curve.first.p1()=iter->get_time();
                        curve.first.p2()=next->get_time();
-                       curve.first.t1()=(curve.first.p2()-curve.first.p1())*(1.0f-iter->get_time_tension());
-                       curve.first.t2()=(curve.first.p2()-curve.first.p1())*(1.0f-next->get_time_tension());
+                       curve.first.t1()=(curve.first.p2()-curve.first.p1())*(1.0f-iter->get_temporal_tension());
+                       curve.first.t2()=(curve.first.p2()-curve.first.p1())*(1.0f-next->get_temporal_tension());
 
 
                        curve.first.sync();

diff --git a/synfig-core/trunk/src/synfig/waypoint.h b/synfig-core/trunk/src/synfig/waypoint.h
index 6752434..41fa723 100644 (file)
--- a/synfig-core/trunk/src/synfig/waypoint.h
+++ b/synfig-core/trunk/src/synfig/waypoint.h
@@ -231,8 +231,8 @@ public:
 
        bool is_static()const;
 
-       float get_time_tension()const { return time_tension; }
-       void set_time_tension(const float& x) { time_tension=x; }
+       float get_temporal_tension()const { return time_tension; }
+       void set_temporal_tension(const float& x) { time_tension=x; }
        float get_temporal_tension()const { return time_tension; }
        void set_temporal_tension(const float& x) { time_tension=x; }