X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointset.cpp;h=f3a5323a07473dfc84fcba20a6854547d50861a0;hb=0f6cbbaa466e8da2ac71586793015854d27f72be;hp=b99daa7d837279e25f7edab696c8a571efa98b78;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp
index b99daa7..f3a5323 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp
@@ -32,6 +32,8 @@
 #include "activepointset.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,7 +46,7 @@ using namespace Action;
 
 ACTION_INIT(Action::ActivepointSet);
 ACTION_SET_NAME(Action::ActivepointSet,"activepoint_set");
-ACTION_SET_LOCAL_NAME(Action::ActivepointSet,"Set Activepoint");
+ACTION_SET_LOCAL_NAME(Action::ActivepointSet,N_("Set Activepoint"));
 ACTION_SET_TASK(Action::ActivepointSet,"set");
 ACTION_SET_CATEGORY(Action::ActivepointSet,Action::CATEGORY_ACTIVEPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointSet,0);
@@ -83,15 +85,14 @@ Action::ActivepointSet::get_param_vocab()
 bool
 Action::ActivepointSet::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-		if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
-			return false;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
 
-		return true;
-	}
-	return false;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+	return (value_desc.parent_is_value_node() &&
+			// We need a dynamic list.
+			ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()));
 }
 
 bool
@@ -191,7 +192,7 @@ Action::ActivepointSet::perform()
 		}
 	}
 
-	//remove all the points we're supposed to be overwritting
+	//remove all the points we're supposed to be overwriting
 	{
 		vector<Activepoint>::iterator 	oi = overwritten_activepoints.begin(),
 										oend = overwritten_activepoints.end();