diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-29 19:04:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 19:04:42 +0200 |
| commit | e51d59ed986374f32b08c57698fb73790b5e5b1d (patch) | |
| tree | 156419dbf54d1709c155dc7e608435716b1c8bba /tools/editor/property_editor.cpp | |
| parent | 91a5c77282f0d5ce7008737f463c1ad27207b99c (diff) | |
| parent | debf574df35caf8e0880b65120e3c79c45e1c92a (diff) | |
Merge pull request #6188 from TheHX/undo-redo
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 9fc9d52aa1..380eb247bb 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -3738,7 +3738,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); |