Move Transform Tool into Normal Tool

[synfig.git] / synfig-studio / src / gtkmm / canvasview.cpp

diff --git a/synfig-studio/src/gtkmm/canvasview.cpp b/synfig-studio/src/gtkmm/canvasview.cpp
index 594ad39..e66b491 100644 (file)
--- a/synfig-studio/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/src/gtkmm/canvasview.cpp
@@ -82,6 +82,7 @@
 #include "dialog_color.h"
 #include "eventkey.h"
 
+#include "state_null.h"
 #include "state_polygon.h"
 #include "state_bline.h"
 #include "state_normal.h"
@@ -719,7 +720,7 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        toggling_snap_grid=false;
        toggling_onion_skin=false;
 
-       smach_.set_default_state(&state_normal);
+       smach_.set_default_state(&state_null);
 
        disp_audio = new Widget_Sound();
 
@@ -2883,7 +2884,7 @@ CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDes
 
        if (ValueNode_BLineCalcVertex::Handle bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node()))
        {
-               ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")));
+               ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link("bline"));
                Real radius = 0.0;
                if (((*(bline_vertex->get_link("loop")))(get_time()).get(bool()))){
                        Real amount_old((*(bline_vertex->get_link("amount")))(get_time()).get(Real()));