Merge ../birdfont-2.x

Changed files (2)

• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/Glyph.vala

Diff

diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex 7cb1be3..837202e 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -1667,6 +1667,7 @@ public class DrawingTools : ToolCollection  { 		stroke_expander.redraw (); 		MainWindow.get_toolbox ().update_expanders (); 	}+ }  }diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 2f237c5..40b3ee7 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -526,12 +526,9 @@ public class Glyph : FontDisplay { 		 		DrawingTools.update_layers (); 		MainWindow.get_toolbox ().update_expanders ();-		-		print(@"PRECOPY $(name)\n");-		print_layers (layers);-//		layers = (Layer) layers.copy (); // FIXME: DELETE-		print("\n");-		print_layers (layers);++		Tool current_tool = MainWindow.get_toolbox ().get_current_tool ();+		current_tool.select_action (current_tool); 	}  	void update_zoom_bar () {