diff options
| author | qarmin <mikrutrafal54@gmail.com> | 2019-06-03 21:52:50 +0200 |
|---|---|---|
| committer | qarmin <mikrutrafal54@gmail.com> | 2019-06-03 21:52:50 +0200 |
| commit | 8245db869f05a86e88338236d22765b87cc71db8 (patch) | |
| tree | 9cad264ada4820d48d6952f1a5564b32cb1619f2 /scene/2d | |
| parent | 8c923fc61740afd560e6c814f7ef19b0cdc30112 (diff) | |
Small fixes to unrechable code, possibly overflows, using NULL pointers
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/camera_2d.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 11846654c5..aa14491577 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -44,15 +44,16 @@ void Camera2D::_update_scroll() { return; } + if (!viewport) + return; + if (current) { ERR_FAIL_COND(custom_viewport && !ObjectDB::get_instance(custom_viewport_id)); Transform2D xform = get_camera_transform(); - if (viewport) { - viewport->set_canvas_transform(xform); - } + viewport->set_canvas_transform(xform); Size2 screen_size = viewport->get_visible_rect().size; Point2 screen_offset = (anchor_mode == ANCHOR_MODE_DRAG_CENTER ? (screen_size * 0.5) : Point2()); |