← Back to team overview

widelands-dev team mailing list archive

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

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands.

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

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1546810 in widelands: "Editor: undo/redo doesn't work when placing terrains in one move"
  https://bugs.launchpad.net/widelands/+bug/1546810

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733

Fixed undo/redo bug when drawing terrains in the editor.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands.
=== 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);


Follow ups