diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-10 15:06:57 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-10 15:06:57 +0100 |
| commit | 97afa41da38abbf94e17cda0c09ef92cfd9263ee (patch) | |
| tree | 4912e98ab77ffe23f81c3ac8f322d86db0af7ace /servers/rendering | |
| parent | 44d5d4e3cde41d6010b784ecc20a891a67c50ac5 (diff) | |
| parent | d249370cd7710a927c159e8ff9d60fabf4907792 (diff) | |
Merge pull request #73000 from Sauermann/fix-editor-viewport-size-zero-crash
Fix crash in editor when setting `SubViewport.size` to zero
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/renderer_viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp index aecd0593bc..d251a81427 100644 --- a/servers/rendering/renderer_viewport.cpp +++ b/servers/rendering/renderer_viewport.cpp @@ -844,7 +844,7 @@ void RendererViewport::viewport_set_scaling_3d_scale(RID p_viewport, float p_sca } void RendererViewport::viewport_set_size(RID p_viewport, int p_width, int p_height) { - ERR_FAIL_COND(p_width < 0 && p_height < 0); + ERR_FAIL_COND(p_width < 0 || p_height < 0); Viewport *viewport = viewport_owner.get_or_null(p_viewport); ERR_FAIL_COND(!viewport); |