diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-29 19:49:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 19:49:31 +0200 |
| commit | 445c7455da85d3505d7d9572052f22281fa95581 (patch) | |
| tree | 6a05289b731cffe19fc9efc135aeb56257460a89 /modules/visual_script | |
| parent | b06fd4cfda67e37d45a5114f81b8b0062e68ed51 (diff) | |
| parent | 0d692e6a8cb7e3645d76d99e2368848871d5d406 (diff) | |
Merge pull request #6324 from djrm/fix_compilation
Fixed compilation
Diffstat (limited to 'modules/visual_script')
| -rw-r--r-- | modules/visual_script/visual_script_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index 3f3b2f3220..f10e4db9c9 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -2620,7 +2620,7 @@ void VisualScriptEditor::_comment_node_resized(const Vector2& p_new_size,int p_n graph->set_block_minimum_size_adjust(true); //faster resize - undo_redo->create_action("Resize Comment",true); + undo_redo->create_action("Resize Comment",UndoRedo::MERGE_ENDS); undo_redo->add_do_method(vsc.ptr(),"set_size",p_new_size/EDSCALE); undo_redo->add_undo_method(vsc.ptr(),"set_size",vsc->get_size()); undo_redo->commit_action(); |