projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
action.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/action.cpp
b/synfig-studio/trunk/src/synfigapp/action.cpp
index
01faded
..
7a98252
100644
(file)
--- 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::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);
ADD_ACTION(Action::TimepointsMove);
ADD_ACTION(Action::TimepointsCopy);
@@
-382,10
+383,10
@@
Super::perform()
prepare();
ActionList::const_iterator iter;
prepare();
ActionList::const_iterator iter;
- //synfig::info("%s:%d actions...", __FILE__, __LINE__);
for(iter=action_list_.begin();iter!=action_list_.end();++iter)
{
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
try
{
try
@@
-409,7
+410,7
@@
Super::perform()
catch(Error x)
{
//synfig::info("%s:%d caught exception", __FILE__, __LINE__);
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());
}
}
//synfig::info("%s:%d finished action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
}