X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=9a247cb6bca121390d688f2c661920e80a96566c;hb=b03d9da72c356e9187a9d707de6fc5ea953b604a;hp=fd4097763de9b4697db2f60f98765b70cc1b1a80;hpb=6989d1403b14b5b27dbf81b2c1cf6889511adf97;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index fd40977..9a247cb 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -948,7 +948,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param { //// debug actions // synfig::info("%s:%d process_action: '%s'", __FILE__, __LINE__, name.c_str()); - + assert(synfigapp::Action::book().count(name)); synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second); @@ -1018,6 +1018,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga param_list=canvas_interface->generate_param_list(value_desc); param_list.add("origin",location); +#ifdef BLINEPOINT_MENU_IS_VERTEX_MENU if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())) { param_list2=canvas_interface->generate_param_list( @@ -1028,6 +1029,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga ); param_list2.add("origin",location); } +#endif // BLINEPOINT_MENU_IS_VERTEX_MENU // Populate the convert menu by looping through // the ValueNode book and find the ones that are @@ -1207,7 +1209,7 @@ edit_several_waypoints(etl::handle canvas_view, std::listget_ui_interface()->error(_("Unable to find waypoint_set_smart action")); + canvas_view->get_ui_interface()->error(_("Unable to find WaypointSetSmart action")); group.cancel(); return; }