From debf574df35caf8e0880b65120e3c79c45e1c92a Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho
Date: Wed, 17 Aug 2016 17:14:51 -0300
Subject: Implemented UndoRedo mergeable modes

---
 tools/editor/property_editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/editor/property_editor.cpp')

diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 0518018e5..41820b517 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3564,7 +3564,7 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) {
 	} else {
 
 
-		undo_redo->create_action(TTR("Set")+" "+p_name,true);
+		undo_redo->create_action(TTR("Set")+" "+p_name,UndoRedo::MERGE_ENDS);
 		undo_redo->add_do_property(obj,p_name,p_value);
 		undo_redo->add_undo_property(obj,p_name,obj->get(p_name));
 		undo_redo->add_do_method(this,"_changed_callback",obj,p_name);
-- 
cgit v1.2.3-70-g09d2