diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-13 15:45:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 15:45:13 -0300 |
| commit | 28034190a9757bc0cbfbf6b2f9582009776b1399 (patch) | |
| tree | 12037d44c40b34d859d3e474d5185b3a91419fa2 /scene/gui/text_edit.cpp | |
| parent | 137464af870d4155d948c5956876936c54c8d6f4 (diff) | |
| parent | 378785656350fc1eacb523ca42307b651607fa6c (diff) | |
Merge pull request #5176 from marcelofg55/master
Fixed overloaded virtual functions with const vs none warning
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 3e374ef888..3d3ef46465 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2892,7 +2892,7 @@ int TextEdit::get_char_count() { return totalsize; // omit last \n } -Size2 TextEdit::get_minimum_size() { +Size2 TextEdit::get_minimum_size() const { return cache.style_normal->get_minimum_size(); } |