X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_animated.cpp;h=c2a32fccae628cc9dfa9dcc332438d211bb694a5;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=56ac9c3c7550ecc2fed70dbc08e0e49af34046c0;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
index 56ac9c3..c2a32fc 100644
--- 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());
@@ -1054,7 +1054,7 @@ synfig::ValueNode_Animated::create(ValueBase::Type type)
 		default:
 			throw
 				Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"synfig::ValueNode_Animated::create()",
-					ValueBase::type_name(type).c_str())
+					ValueBase::type_local_name(type).c_str())
 				);
 			break;
 	}