diff options
| author | Rémi Verschelde | 2017-08-22 00:58:12 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-22 00:58:12 +0200 |
| commit | df590fc2d33c1ba715a4ce58f71d83e0ed9f5693 (patch) | |
| tree | 8bfdc3e033aaf4dc9a5de5e8040e4f99afa0c540 /scene/gui | |
| parent | 13f879587dd9bce59528e44b0faaf6e062f6d918 (diff) | |
| parent | 738d2ab96997faa1e13b91e38cf8a0000d829f70 (diff) | |
| download | godot-df590fc2d33c1ba715a4ce58f71d83e0ed9f5693.tar.gz godot-df590fc2d33c1ba715a4ce58f71d83e0ed9f5693.tar.zst godot-df590fc2d33c1ba715a4ce58f71d83e0ed9f5693.zip | |
Merge pull request #10340 from Rubonnek/remove-unnecessary-assignments
Removed unnecessary assignments
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/video_player.cpp | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 0ed2487e5..f15fb71f8 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3898,11 +3898,9 @@ bool TextEdit::search(const String &p_key, uint32_t p_search_flags, int p_from_l //search through the whole documment, but start by current line - int line = -1; + int line = p_from_line; int pos = -1; - line = p_from_line; - for (int i = 0; i < text.size() + 1; i++) { //backwards is broken... //int idx=(p_search_flags&SEARCH_BACKWARDS)?(text.size()-i):i; //do backwards seearch diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index f819574e9..20bf818d4 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1459,7 +1459,6 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c c.selected = true; selected_item = p_selected; selected_col = 0; - selected_item = p_selected; if (!emitted_row) { emit_signal("item_selected"); emitted_row = true; diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 4886b1cc2..37d10fb63 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -399,7 +399,6 @@ VideoPlayer::VideoPlayer() { paused = false; autoplay = false; expand = true; - loops = false; audio_track = 0; |