Merge branch 'tool-updates'

1 files changed, 11 insertions, 1 deletions

diff --git a/src/editor/gui.cpp b/src/editor/gui.cpp
index 39914c8..c5e44df 100644
--- a/src/editor/gui.cpp
+++ b/src/editor/gui.cpp
@@ -69,7 +69,17 @@ void editor_update_toolview( GAME_EDITOR* e ) {
   gui_editor_toolview_update( egui->tool );
 }
 
-void settool( U8 t ) { editor->tool.type = t; }
+void settool( U8 t ) {
+  editor->tool.type = t;
+
+  if( editor->gui.v2d ) {
+    editor->gui.v2d->poly_drag = 0;
+  }
+
+  if( editor->gui.tool ) {
+    editor_update_toolview( editor );
+  }
+}
 void editor_create_toolview_column( GAME_EDITOR* e ) {
   GAME_EDITOR::EDITOR_GUI* egui = &e->gui;