X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=91c58ca7b7c5774ebf9e453023cdb12d0d28ece2;hb=acb13618841e7cecba6f4c989b7670909f8ac235;hp=c703b6d4ff76777f207b66d727e5b023fc3e31f5;hpb=99bd2febc090ec3bf10463b180c388fe55474b46;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
index c703b6d..91c58ca 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.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
@@ -100,28 +101,27 @@ Action::ValueDescDisconnect::get_param_vocab()
 bool
 Action::ValueDescDisconnect::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-
-		// don't allow the Index parameter of the Duplicate layer to be disconnected
-		if(value_desc.parent_is_layer_param() && value_desc.get_layer()->get_name() == "duplicate" && value_desc.get_param_name() == "index")
-			return false;
-		if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
-			return true;
-		if(value_desc.is_const())
-			return false;
-		if(value_desc.is_value_node() && ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()))
-			return false;
-		// don't allow Duplicate ValueNodes in the Children dialog to be disconnected
-		if(value_desc.is_value_node() &&
-		   ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
-		   !value_desc.parent_is_layer_param() &&
-		   !value_desc.parent_is_value_node())
-			return false;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
+
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+	// don't allow the Index parameter of the Duplicate layer to be disconnected
+	if(value_desc.parent_is_layer_param() && value_desc.get_layer()->get_name() == "duplicate" && value_desc.get_param_name() == "index")
+		return false;
+	if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
 		return true;
-	}
-	return false;
+	if(value_desc.is_const())
+		return false;
+	if(value_desc.is_value_node() && ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()))
+		return false;
+	// don't allow Duplicate ValueNodes in the Children dialog to be disconnected
+	if(value_desc.is_value_node() &&
+	   ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
+	   !value_desc.parent_is_layer_param() &&
+	   !value_desc.parent_is_value_node())
+		return false;
+	return true;
 }
 
 bool