asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #24738 from timoschwarzer/24725-fit-child-in-rect-null-check

Browse source 
Check if p_child is not null in Container.fit_child_rect()
This commit is contained in:
Rémi Verschelde 2019-01-04 14:54:57 +01:00 committed by GitHub
commit fa5ca1bbf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scene/gui/container.cpp
View file

@ -95,6 +95,7 @@ void Container::_sort_children() {
void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
ERR_FAIL_COND(!p_child);
ERR_FAIL_COND(p_child->get_parent() != this);
Size2 minsize = p_child->get_combined_minimum_size();