diff options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_player.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/text_paragraph.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 159ccae130..506106687b 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -782,13 +782,13 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f delta = next_pos - cd.pos; // Fix delta (after determination of backwards because negative zero is lost here) if (&cd == &playback.current) { - if (!backwards && cd.pos <= len && next_pos == len /*&& playback.blend.empty()*/) { + if (!backwards && cd.pos <= len && next_pos == len) { //playback finished end_reached = true; end_notify = cd.pos < len; // Notify only if not already at the end } - if (backwards && cd.pos >= 0 && next_pos == 0 /*&& playback.blend.empty()*/) { + if (backwards && cd.pos >= 0 && next_pos == 0) { //playback finished end_reached = true; end_notify = cd.pos > 0; // Notify only if not already at the beginning diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 68c0f5eb5b..82f2106432 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -2359,7 +2359,7 @@ bool RichTextLabel::remove_line(const int p_line) { void RichTextLabel::push_dropcap(const String &p_string, const Ref<Font> &p_font, int p_size, const Rect2 &p_dropcap_margins, const Color &p_color, int p_ol_size, const Color &p_ol_color) { ERR_FAIL_COND(current->type == ITEM_TABLE); - ERR_FAIL_COND(p_string.empty()); + ERR_FAIL_COND(p_string.is_empty()); ERR_FAIL_COND(p_font.is_null()); ERR_FAIL_COND(p_size <= 0); diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp index c9e8a8fbc6..60e86e95db 100644 --- a/scene/resources/text_paragraph.cpp +++ b/scene/resources/text_paragraph.cpp @@ -147,7 +147,7 @@ void TextParagraph::_shape_lines() { TS->free(line); break; } - if (!tab_stops.empty()) { + if (!tab_stops.is_empty()) { TS->shaped_text_tab_align(line, tab_stops); } if (align == HALIGN_FILL && (line_breaks.size() == 1 || i < line_breaks.size() - 1)) { |