godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Implemented UndoRedo mergeable modes

Browse Source
This commit is contained in:
Franklin Sobrinho
2016-08-17 17:14:51 -03:00
parent 56fa741b7a
commit debf574df3
8 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/property_editor.cpp
View File

@@ -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);