diff options
| author | Franklin Sobrinho | 2016-08-17 17:14:51 -0300 |
|---|---|---|
| committer | Franklin Sobrinho | 2016-08-17 17:14:51 -0300 |
| commit | debf574df35caf8e0880b65120e3c79c45e1c92a (patch) | |
| tree | 10e512fc5bca08cc20ad593ef70c9c6d85fba125 /tools/editor/property_editor.cpp | |
| parent | 56fa741b7a729bd5a00cff17e4382af547de92ad (diff) | |
| download | godot-debf574df35caf8e0880b65120e3c79c45e1c92a.tar.gz godot-debf574df35caf8e0880b65120e3c79c45e1c92a.tar.zst godot-debf574df35caf8e0880b65120e3c79c45e1c92a.zip | |
Implemented UndoRedo mergeable modes
Diffstat (limited to 'tools/editor/property_editor.cpp')
| -rw-r--r-- | tools/editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |