2 files changed, 27 insertions, 9 deletions

diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index b38ff239cc..7d4415ba9e 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -328,6 +328,9 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 	}
 
 	autoplay->set_pressed(current == player->get_autoplay());
+
+	AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
+	EditorNode::get_singleton()->update_keying();
 }
 
 void AnimationPlayerEditor::_animation_new() {
@@ -850,8 +853,11 @@ void AnimationPlayerEditor::_update_player() {
 			active_idx = animation->get_item_count() - 1;
 	}
 
-	if (!player)
+	if (!player) {
+		AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
+		EditorNode::get_singleton()->update_keying();
 		return;
+	}
 
 	updating = false;
 	if (active_idx != -1) {
@@ -864,6 +870,8 @@ void AnimationPlayerEditor::_update_player() {
 		animation->select(0);
 		autoplay->set_pressed(animation->get_item_text(0) == player->get_autoplay());
 		_animation_selected(0);
+	} else {
+		_animation_selected(0);
 	}
 
 	//pause->set_pressed(player->is_paused());
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index 30fff474d7..37b8562e96 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -471,7 +471,11 @@ void SpatialEditorViewport::_find_items_at_pos(const Point2 &p_pos, bool &r_incl
 Vector3 SpatialEditorViewport::_get_screen_to_space(const Vector3 &p_vector3) {
 
 	CameraMatrix cm;
-	cm.set_perspective(get_fov(), get_size().aspect(), get_znear() + p_vector3.z, get_zfar());
+	if (orthogonal) {
+		cm.set_orthogonal(camera->get_size(), get_size().aspect(), get_znear() + p_vector3.z, get_zfar());
+	} else {
+		cm.set_perspective(get_fov(), get_size().aspect(), get_znear() + p_vector3.z, get_zfar());
+	}
 	float screen_w, screen_h;
 	cm.get_viewport_size(screen_w, screen_h);
 
@@ -518,18 +522,24 @@ void SpatialEditorViewport::_select_region() {
 
 		Vector3 a = _get_screen_to_space(box[i]);
 		Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
-		frustum.push_back(Plane(a, b, cam_pos));
+		if (orthogonal) {
+			frustum.push_back(Plane(a, (a - b).normalized()));
+		} else {
+			frustum.push_back(Plane(a, b, cam_pos));
+		}
 	}
 
-	Plane near(cam_pos, -_get_camera_normal());
-	near.d -= get_znear();
+	if (!orthogonal) {
+		Plane near(cam_pos, -_get_camera_normal());
+		near.d -= get_znear();
 
-	frustum.push_back(near);
+		frustum.push_back(near);
 
-	Plane far = -near;
-	far.d += get_zfar();
+		Plane far = -near;
+		far.d += get_zfar();
 
-	frustum.push_back(far);
+		frustum.push_back(far);
+	}
 
 	Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_convex(frustum, get_tree()->get_root()->get_world()->get_scenario());
 	Vector<Spatial *> selected;