godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-04 17:04:49 +00:00
Code Releases Wiki Activity

Merge pull request #6188 from TheHX/undo-redo

Browse Source 
Implemented UndoRedo mergeable modes
This commit is contained in:
Rémi Verschelde
2016-08-29 19:04:42 +02:00
committed by GitHub
parent 91a5c77282 debf574df3
commit e51d59ed98
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

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