projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...
[synfig.git]
/
synfig-studio
/
tags
/
stable
/
src
/
synfigapp
/
actions
/
activepointremove.cpp
diff --git
a/synfig-studio/tags/stable/src/synfigapp/actions/activepointremove.cpp
b/synfig-studio/tags/stable/src/synfigapp/actions/activepointremove.cpp
index
7626eb0
..
527e2c9
100644
(file)
--- a/
synfig-studio/tags/stable/src/synfigapp/actions/activepointremove.cpp
+++ b/
synfig-studio/tags/stable/src/synfigapp/actions/activepointremove.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-85,15
+86,14
@@
Action::ActivepointRemove::get_param_vocab()
bool
Action::ActivepointRemove::is_candidate(const ParamList &x)
{
bool
Action::ActivepointRemove::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
}
bool