Merge pull request #33500 from nekomatata/button-icon-override-crash-2

Fixed crash when using icon override in button

Merge pull request #33500 from nekomatata/button-icon-override-crash-2
f2cd52dd · Rémi Verschelde · GitHub · 3aeb43f1 · 0fc0f0fc · f2cd52dd
Unverified Commit f2cd52dd authored Nov 10, 2019 by Rémi Verschelde Committed by GitHub Nov 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

button.cpp scene/gui/button.cpp +1 -1

No files found.
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -179,7 +179,7 @@ void Button::_notification(int p_what) {

 					if (icon_width > _size.width) {
 						icon_width = _size.width;
-						icon_height = icon->get_height() * icon_width / _icon->get_width();
+						icon_height = _icon->get_height() * icon_width / _icon->get_width();
 					}

 					icon_region = Rect2(style->get_offset() + Point2(icon_ofs_region, (_size.height - icon_height) / 2), Size2(icon_width, icon_height));