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

Merge pull request #46008 from akien-mga/3.2-fix-camera-align-crash-45976

Browse source 
Camera2D: Fix crash calling align when not in tree
This commit is contained in:
Rémi Verschelde 2021-02-16 12:18:38 +01:00 committed by GitHub
commit 1611d3dc17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/2d/camera_2d.cpp
View file

@ -94,7 +94,7 @@ Vector2 Camera2D::get_zoom() const {
Transform2D Camera2D::get_camera_transform() {
if (!get_tree())
if (!get_tree() || !viewport)
return Transform2D();
ERR_FAIL_COND_V(custom_viewport && !ObjectDB::get_instance(custom_viewport_id), Transform2D());
@ -498,6 +498,7 @@ void Camera2D::reset_smoothing() {
void Camera2D::align() {
ERR_FAIL_COND(!is_inside_tree() || !viewport);
ERR_FAIL_COND(custom_viewport && !ObjectDB::get_instance(custom_viewport_id));
Size2 screen_size = viewport->get_visible_rect().size;