diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-01-20 15:34:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 15:34:41 +0100 |
commit | 9e0973ca23423f270df3589e2766a0918e409526 (patch) | |
tree | 23dcbc05cd421ea5d31edbbb052cfb871b9ce1ec /scene | |
parent | 3eb585e478d81a3181c2f32356d6a0c69c19db4a (diff) | |
parent | b411a731fef9af1c0a73e4d5b718e5a6b12af1c2 (diff) |
Merge pull request #56972 from lawnjelly/warn_unused
Diffstat (limited to 'scene')
-rw-r--r-- | scene/main/canvas_item.cpp | 4 | ||||
-rw-r--r-- | scene/resources/immediate_mesh.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 59d933fa1d..a0916c6291 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -1017,8 +1017,8 @@ void CanvasItem::set_notify_transform(bool p_enable) { notify_transform = p_enable; if (notify_transform && is_inside_tree()) { - //this ensures that invalid globals get resolved, so notifications can be received - get_global_transform(); + // This ensures that invalid globals get resolved, so notifications can be received. + _ALLOW_DISCARD_ get_global_transform(); } } diff --git a/scene/resources/immediate_mesh.cpp b/scene/resources/immediate_mesh.cpp index b9469803a0..28afef8638 100644 --- a/scene/resources/immediate_mesh.cpp +++ b/scene/resources/immediate_mesh.cpp @@ -382,7 +382,7 @@ AABB ImmediateMesh::get_aabb() const { if (i == 0) { aabb = surfaces[i].aabb; } else { - aabb.merge(surfaces[i].aabb); + aabb = aabb.merge(surfaces[i].aabb); } } return aabb; |