瀏覽代碼

Merge pull request #69645 from radenling/backport-fix-viewport-update-in-editor

[3.x] Fix for 2D viewport not updating in the editor when the camera moves
Rémi Verschelde 2 年之前
父節點
當前提交
564622af51
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      scene/2d/camera_2d.cpp

+ 5 - 2
scene/2d/camera_2d.cpp

@@ -41,8 +41,11 @@ void Camera2D::_update_scroll() {
 	}
 	}
 
 
 	if (Engine::get_singleton()->is_editor_hint()) {
 	if (Engine::get_singleton()->is_editor_hint()) {
-		update(); //will just be drawn
-		return;
+		update();
+		// Only set viewport transform when not bound to the main viewport.
+		if (get_viewport() == get_tree()->get_edited_scene_root()->get_viewport()) {
+			return;
+		}
 	}
 	}
 
 
 	if (!viewport) {
 	if (!viewport) {