浏览代码

Merge pull request #59200 from Sauermann/fix-unused-conditional

Simplify always true conditional
Rémi Verschelde 3 年之前
父节点
当前提交
cd500eee8b
共有 1 个文件被更改,包括 1 次插入6 次删除
  1. 1 6
      scene/main/canvas_item.cpp

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