X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=a7ca4cfd94642d3ac3aaf64af45bbe763b4b8f3a;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=01f38aee1f58b74c6f445f7a161d78368d5e8973;hpb=ecc347144009a3e518949c13dca084bc469fda62;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
index 01f38ae..a7ca4cf 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
@@ -84,9 +84,7 @@ Action::ValueDescSet::get_local_name()const
 	}
 	else if(value_desc.parent_is_layer_param())
 		name = strprintf(_("'%s' -> %s"),
-						 (value_desc.get_layer()->get_description().empty()
-						  ? value_desc.get_layer()->get_local_name()
-						  : value_desc.get_layer()->get_description()).c_str(),
+						 value_desc.get_layer()->get_non_empty_description().c_str(),
 						 value_desc.get_param_name().c_str());
 	else if(value_desc.parent_is_value_node())
 	{
@@ -96,10 +94,8 @@ Action::ValueDescSet::get_local_name()const
 		Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
 		if(parent_layer)
 			name = strprintf(_("'%s' => %s"),
-							 (parent_layer->get_description().empty()
-							  ? parent_layer->get_local_name()
-							  : parent_layer->get_description()).c_str(),
-							 value_node->link_local_name(value_desc.get_index()).c_str()); 
+							 parent_layer->get_non_empty_description().c_str(),
+							 value_node->link_local_name(value_desc.get_index()).c_str());
 		else
 			name = value_node->link_local_name(value_desc.get_index());
 	}
@@ -197,7 +193,6 @@ Action::ValueDescSet::prepare()
 
 		if (value_desc.get_index()==4) {
 			printf("copying change to tangent 2\n");
-			DEBUGPOINT();
 			ValueNode_Composite::Handle parent_value_node;
 			parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node());
 
@@ -515,7 +510,6 @@ Action::ValueDescSet::prepare()
 			if(!action->is_ready())
 				throw Error(Error::TYPE_NOTREADY);
 
-				DEBUGPOINT();
 			add_action_front(action);
 		}
 		else
@@ -523,7 +517,6 @@ Action::ValueDescSet::prepare()
 			value_node=value_node.cast_dynamic(value_desc.get_value_node());
 		}
 
-				DEBUGPOINT();
 		if(!value_node)
 			throw Error(_("Direct manipulation of this ValueNode type is not yet supported"));
 
@@ -545,7 +538,6 @@ Action::ValueDescSet::prepare()
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
 
-				DEBUGPOINT();
 		add_action(action);
 
 		return;