From fb79c2ed5d6bc0c8c2cdb11018a02d61aca1fdb7 Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Mon, 6 Sep 2010 20:22:51 +0200 Subject: [PATCH] Fix bug 3060560: Link two tangents and one is animated, the animated is lost. --- synfig-studio/src/synfigapp/actions/valuedesclink.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp index 66c736e..7f98228 100644 --- a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp @@ -180,6 +180,25 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints."); } } + // If both are Linkable Value Nodes and has waypoint in its children, use the one with more waypoints + else if(LinkableValueNode::Handle::cast_dynamic(link_value_node) && + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node()) && + LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() != + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) + { + if(LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() < + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) + { + status_level = 4; + status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); + link_value_node=value_desc.get_value_node(); + } + else if (status_level <= 4) + { + status_level = 4; + status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); + } + } // Use the one that was least recently changed else if(link_value_node->get_time_last_changed()!=value_desc.get_value_node()->get_time_last_changed()) { -- 2.7.4