summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-03-16 23:49:28 +0100
committerGitHub <noreply@github.com>2022-03-16 23:49:28 +0100
commitcd500eee8b1e6b2e3a0f6971b521291415eda6ce (patch)
tree11b62d803a3a78e955d2e287e52f35fd26284827
parentc950db6652f162aa8919aeacd681ff8c984f90f6 (diff)
parent7451fa63f2d9d8fb40d7d62a22bbc1368479a5e8 (diff)
Merge pull request #59200 from Sauermann/fix-unused-conditional
Simplify always true conditional
-rw-r--r--scene/main/canvas_item.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index 1d263ba858..ec0821557b 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -995,12 +995,7 @@ Transform2D CanvasItem::get_viewport_transform() const {
ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
if (canvas_layer) {
- if (get_viewport()) {
- return get_viewport()->get_final_transform() * canvas_layer->get_transform();
- } else {
- return canvas_layer->get_transform();
- }
-
+ return get_viewport()->get_final_transform() * canvas_layer->get_transform();
} else {
return get_viewport()->get_final_transform() * get_viewport()->get_canvas_transform();
}