Author: Carlos Lopez <[email protected]>
Date: Thu Nov 10 18:47:52 2011 +0100
When modify a value that has a waypoint at the current time, don't modify its
interpolations, only the value.
---
.../src/synfigapp/actions/valuedescset.cpp | 22 +++++++++++++++++--
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/synfig-studio/src/synfigapp/actions/valuedescset.cpp
b/synfig-studio/src/synfigapp/actions/valuedescset.cpp
index 0fe3239..a1fa126 100644
--- a/synfig-studio/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/src/synfigapp/actions/valuedescset.cpp
@@ -726,6 +726,11 @@ Action::ValueDescSet::prepare()
else
value=value_desc.get_value();
if(!value_node)value_node=ValueNode_Animated::create(value,time);
+ // Be sure that the newly created waypoint is set with
the default
+ // interpolations.
+ synfig::ValueNode_Animated::WaypointList::iterator
iter(value_node->find(time));
+ iter->set_before(synfigapp::Main::get_interpolation());
+ iter->set_after(synfigapp::Main::get_interpolation());
Action::Handle action;
if(!value_desc.is_value_node())
{
@@ -751,11 +756,22 @@ Action::ValueDescSet::prepare()
}
if(!value_node)
throw Error(_("Direct manipulation of this ValueNode
type is not yet supported"));
+ synfig::ValueNode_Animated::WaypointList::iterator iter;
+ Waypoint waypoint;
Action::Handle action(WaypointSetSmart::create());
- Waypoint waypoint(value_node->new_waypoint_at_time(time));
+ try
+ {
+ iter=value_node->find(time);
+ // value_node->find throws an exception
+ // when no waypoint is found at given time
+ waypoint=*iter;
+ }catch(Exception::NotFound)
+ {
+ waypoint=value_node->new_waypoint_at_time(time);
+
waypoint.set_before(synfigapp::Main::get_interpolation());
+
waypoint.set_after(synfigapp::Main::get_interpolation());
+ }
waypoint.set_value(value);
- waypoint.set_before(synfigapp::Main::get_interpolation());
- waypoint.set_after(synfigapp::Main::get_interpolation());
action->set_param("canvas",get_canvas());
action->set_param("canvas_interface",get_canvas_interface());
action->set_param("value_node",ValueNode::Handle(value_node));
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
