Merge lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

[GunChleoc]

Fixed undo/redo bug when drawing terrains in the editor.

Fixed undo/redo bug when drawing terrains in the editor.

[kaputtnik (franku)]

Works perfect again :-)

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 739. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110576262.
Appveyor build 585. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1546810_undo_redo-585.

[GunChleoc (gunchleoc)]

Thanks for testing! The code change is trivial, so I'm gonna merge.

@bunnybot merge

[SirVer (sirver)]

no idea what that string change does, frankly...

review: Approve

[GunChleoc (gunchleoc)]

Me neither, which is why I caused this bug in the first place *lol

=== modified file 'src/editor/tools/editor_draw_tool.h'
--- src/editor/tools/editor_draw_tool.h	2016-01-28 05:24:34 +0000
+++ src/editor/tools/editor_draw_tool.h	2016-02-20 10:41:42 +0000
@@ -43,7 +43,7 @@
 	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
-		return "images/ui_basic/fsel.png";
+		return "EDITOR_DRAW_TOOL";
 	}
 
 	void add_action(EditorToolAction ac, EditorActionArgs & args);