Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
index b6f9189..c2a32fc 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -237,7 +237,7 @@ private:
        Time r,s;
 
 public:
-       ValueNode* clone(const GUID& deriv_guid)const
+       ValueNode* clone(const synfig::GUID& deriv_guid)const
        {
                { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; }
                _Hermite<T>* ret(new _Hermite<T>());
@@ -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();
@@ -538,7 +538,7 @@ private:
        Time r,s;
 
 public:
-       ValueNode* clone(const GUID& deriv_guid)const
+       ValueNode* clone(const synfig::GUID& deriv_guid)const
        {
                { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; }
                _Constant<T>* ret(new _Constant<T>());
@@ -636,7 +636,7 @@ private:
        Time r,s;
 
 public:
-       ValueNode* clone(const GUID& deriv_guid)const
+       ValueNode* clone(const synfig::GUID& deriv_guid)const
        {
                { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; }
                _AnimBool* ret(new _AnimBool());