X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_composite.cpp;h=0acc79c6f10a888e4a7cdc7850a642b04393bd84;hb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;hp=03632dfabec82d562013f5da29168506f44d9237;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
index 03632df..0acc79c 100644
--- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_composite.cpp
-**	\brief Template File
+**	\brief Implementation of the "Composite" valuenode conversion.
 **
-**	$Id: valuenode_composite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -184,8 +184,7 @@ ValueNode_Composite::link_count()const
 bool
 ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i>=0);
-	assert(i<6);
+	assert(i>=0 && i<link_count());
 
 	if(PlaceholderValueNode::Handle::cast_dynamic(x))
 	{
@@ -196,7 +195,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
-			assert(i<2);
 			if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
 			{
 				components[i]=x;
@@ -205,7 +203,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 			break;
 
 		case ValueBase::TYPE_COLOR:
-			assert(i<4);
 			if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
 			{
 				components[i]=x;
@@ -214,7 +211,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 			break;
 
 		case ValueBase::TYPE_SEGMENT:
-			assert(i<4);
 			if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
 			{
 				components[i]=x;
@@ -223,7 +219,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 			break;
 
 		case ValueBase::TYPE_BLINEPOINT:
-			assert(i<6);
 			if((i==0 || i==4 || i==5) && x->get_type()==ValueBase(Point()).get_type())
 			{
 				components[i]=x;
@@ -250,14 +245,16 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Composite::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	return components[i];
 }
 
 String
 ValueNode_Composite::link_local_name(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -298,16 +295,17 @@ ValueNode_Composite::link_local_name(int i)const
 				return _("Tangent 2");
 
 		default:
-			break;
+			return etl::strprintf(_("C%d"),i+1);
 	}
-	return etl::strprintf(_("C%d"),i+1);
 }
 
 
 String
 ValueNode_Composite::link_name(int i)const
 {
-	assert(i>=0 && i<5);
+	assert(i>=0 && i<link_count());
+
+	printf("!!! link_name(%d)\n", i);
 	return strprintf("c%d",i);
 }