Merge pull request #81383 from AThousandShips/valid_remove

Remove unnecessary validity checks from `Button` and `TextureRect`
godotengine · Sep 7, 2023 · 4bf3de7 · 4bf3de7
2 parents 632bbc6 + 380db4d
commit 4bf3de7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
@@ -554,10 +554,8 @@ void Button::set_icon(const Ref<Texture2D> &p_icon) {
 }
 
 void Button::_texture_changed() {
-	if (icon.is_valid()) {
-		queue_redraw();
-		update_minimum_size();
-	}
+	queue_redraw();
+	update_minimum_size();
 }
 
 Ref<Texture2D> Button::get_icon() const {

diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp
@@ -189,10 +189,8 @@ bool TextureRect::_set(const StringName &p_name, const Variant &p_value) {
 #endif
 
 void TextureRect::_texture_changed() {
-	if (texture.is_valid()) {
-		queue_redraw();
-		update_minimum_size();
-	}
+	queue_redraw();
+	update_minimum_size();
 }
 
 void TextureRect::set_texture(const Ref<Texture2D> &p_tex) {