Author: Carlos Lopez <genet...@gmail.com>
Date:   Thu Nov 17 18:06:31 2011 +0100

Restore functionality removed in a previous commit: Offer sub menus to access 
interpolations and default and zero width.

---

 synfig-studio/src/gui/instance.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/synfig-studio/src/gui/instance.cpp 
b/synfig-studio/src/gui/instance.cpp
index 8877ff7..e12b425 100644
--- a/synfig-studio/src/gui/instance.cpp
+++ b/synfig-studio/src/gui/instance.cpp
@@ -892,7 +892,7 @@ void
 Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, 
synfigapp::ValueDesc value_desc, float location, bool bezier)
 {
        Gtk::Menu& parammenu(*menu);
-
+       synfigapp::ValueDesc value_desc2(value_desc);
        etl::handle<synfigapp::CanvasInterface> 
canvas_interface(find_canvas_interface(canvas));
 
        if(!canvas_interface)
@@ -974,16 +974,16 @@ Instance::make_param_menu(Gtk::Menu 
*menu,synfig::Canvas::Handle canvas, synfiga
        else
                add_actions_to_menu(&parammenu, 
param_list2,param_list,categories);
 
-       if((value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT || 
value_desc.get_value_type()==ValueBase::TYPE_WIDTHPOINT)
-        && value_desc.is_value_node() && 
ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
+       if((value_desc2.get_value_type()==ValueBase::TYPE_BLINEPOINT || 
value_desc2.get_value_type()==ValueBase::TYPE_WIDTHPOINT)
+        && value_desc2.is_value_node() && 
ValueNode_Composite::Handle::cast_dynamic(value_desc2.get_value_node()))
        {
                // the index=0 is position for widthpoint and vertex for 
blinepoint
-               
value_desc=synfigapp::ValueDesc(ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()),0);
+               
value_desc2=synfigapp::ValueDesc(ValueNode_Composite::Handle::cast_dynamic(value_desc2.get_value_node()),0);
        }
 
-       if(value_desc.is_value_node() && 
ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node()))
+       if(value_desc2.is_value_node() && 
ValueNode_Animated::Handle::cast_dynamic(value_desc2.get_value_node()))
        {
-               ValueNode_Animated::Handle 
value_node(ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node()));
+               ValueNode_Animated::Handle 
value_node(ValueNode_Animated::Handle::cast_dynamic(value_desc2.get_value_node()));
 
                try
                {
@@ -1002,7 +1002,7 @@ Instance::make_param_menu(Gtk::Menu 
*menu,synfig::Canvas::Handle canvas, synfiga
                                                ),
                                                waypoint_set
                                        ),
-                                       value_desc
+                                       value_desc2
                                )
                        ));
                }


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to