X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=fdba2773cb49ecaa07c82d927b6fb973b5e5a484;hb=0f9ceff3703a03265112e8bcfb2b31d959aa99d6;hp=9904d14b0ef8d32a2409f3978704db7989453174;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index 9904d14..fdba277 100644
--- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@ -2,19 +2,20 @@
 /*!	\file valuenode_scale.cpp
 **	\brief Template File
 **
-**	$Id: valuenode_scale.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -54,7 +55,8 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL)
+ValueNode_Scale::ValueNode_Scale():
+	LinkableValueNode(synfig::ValueBase::TYPE_NIL)
 {
 	set_scalar(1.0);
 }
@@ -78,11 +80,11 @@ ValueNode_Scale::create(const ValueBase& x)
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));			
+		throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));
 	}
 	assert(value_node);
 	assert(value_node->get_type()==x.get_type());
-	
+
 	return value_node;
 }
 
@@ -176,8 +178,8 @@ synfig::ValueNode_Scale::operator()(Time t)const
 		Color ret((*value_node)(t).get(Color()));
 		Real s((*scalar)(t).get(Real()));
 		ret.set_r(ret.get_r()*s);
-		ret.set_g(ret.get_r()*s);
-		ret.set_b(ret.get_r()*s);
+		ret.set_g(ret.get_g()*s);
+		ret.set_b(ret.get_b()*s);
 		return ret;
 	}
 
@@ -191,13 +193,13 @@ ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
 {
 	if(!(i==0 || i==1))
 		return false;
-	
+
 	if(i==0 && !set_value_node(x))
 		return false;
 	else
 	if(i==1 && !set_scalar(x))
 		return false;
-	
+
 	signal_child_changed()(i);signal_value_changed()();
 
 	return true;
@@ -229,7 +231,7 @@ ValueNode_Scale::link_local_name(int i)const
 	else if(i==1)
 		return _("Scalar");
 	return String();
-}	
+}
 
 String
 ValueNode_Scale::link_name(int i)const
@@ -249,7 +251,7 @@ ValueNode_Scale::get_link_index_from_name(const String &name)const
 		return 0;
 	if(name=="scalar")
 		return 1;
-	
+
 	throw Exception::BadLinkName(name);
 }