2
0
Эх сурвалжийг харах

Simplify always true conditional

get_viewport() is always true, because is_inside_tree() is true.
Markus Sauermann 3 жил өмнө
parent
commit
7451fa63f2

+ 1 - 6
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();
 	}