Merge pull request #79645 from adamscott/fix-camera-2d-editor

Fix Camera2D crash when edited scene root is null
godotengine · Jul 21, 2023 · 7a31331 · 7a31331
2 parents 1843781 + deb45c0
commit 7a31331
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
@@ -41,7 +41,7 @@ void Camera2D::_update_scroll() {
 	if (Engine::get_singleton()->is_editor_hint()) {
 		queue_redraw();
 		// Only set viewport transform when not bound to the main viewport.
-		if (get_viewport() == get_tree()->get_edited_scene_root()->get_viewport()) {
+		if (get_tree()->get_edited_scene_root() && get_viewport() == get_tree()->get_edited_scene_root()->get_viewport()) {
 			return;
 		}
 	}