X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_composite.cpp;h=7e18ea026d6f301f221b77afa1a9a50ef325b456;hb=b629d4c68aa88800d2db81e922468da3e5122bef;hp=e10999ae31fcf4b42dc7403aa78dca3d398da468;hpb=4a614feb74e3853af7d1de1b4a797d47aad11742;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
index e10999a..7e18ea0 100644
--- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 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
@@ -37,6 +38,7 @@
 #include "vector.h"
 #include "color.h"
 #include "segment.h"
+#include "savecanvas.h"
 
 #endif
 
@@ -112,6 +114,9 @@ ValueNode_Composite::create_new()const
 ValueBase
 synfig::ValueNode_Composite::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -309,6 +314,9 @@ ValueNode_Composite::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
 
+	if (get_file_version() < RELEASE_VERSION_0_61_08)
+		return strprintf("c%d",i+1);
+
 	switch(get_type())
 	{
 	case ValueBase::TYPE_COLOR:
@@ -364,11 +372,8 @@ ValueNode_Composite::get_link_index_from_name(const String &name)const
 	if(name.empty())
 		throw Exception::BadLinkName(name);
 
-	if(name[0]=='c')
-	{
-		warning("%s:%d is this EVER called?", __FILE__, __LINE__);
+	if(name[0]=='c' && name.size() == 2 && name[1]-'1' >= 0 && name[1]-'1' < link_count())
 		return name[1]-'1';
-	}
 
 	switch(get_type())
 	{