X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction.cpp;h=7a982524d00e1f29d4c73070c95a5463afc28778;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=01faded4a26e58bdce1e873ed31272a69f930714;hpb=c5b36e6af411e3806ef81c0ae61d286f50ac6477;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index 01faded..7a98252 100644
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -226,7 +226,8 @@ Action::Main::Main()
 	ADD_ACTION(Action::BLinePointTangentSplit);
 
 	ADD_ACTION(Action::GradientSet);
-	ADD_ACTION(Action::ColorSet);
+	ADD_ACTION(Action::ColorSetFromOC);
+	ADD_ACTION(Action::ColorSetFromFC);
 
 	ADD_ACTION(Action::TimepointsMove);
 	ADD_ACTION(Action::TimepointsCopy);
@@ -382,10 +383,10 @@ Super::perform()
 	prepare();
 
 	ActionList::const_iterator iter;
-	//synfig::info("%s:%d actions...", __FILE__, __LINE__);
 	for(iter=action_list_.begin();iter!=action_list_.end();++iter)
 	{
-		//synfig::info("%s:%d action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
+		//// debug actions
+		// synfig::info("%s:%d action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
 		try
 		{
 			try
@@ -409,7 +410,7 @@ Super::perform()
 		catch(Error x)
 		{
 			//synfig::info("%s:%d caught exception", __FILE__, __LINE__);
-			throw Error(x.get_type(),((*iter)->get_name()+": "+x.get_desc()).c_str());
+			throw Error(x.get_type(),((*iter)->get_local_name()+": "+x.get_desc()).c_str());
 		}
 		//synfig::info("%s:%d finished action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
 	}