Browse Source

Merge pull request #95768 from AThousandShips/fix_far

Fix compilation issues caused by `far` identifier
Rémi Verschelde 1 year ago
parent
commit
7a4a6fbc03
1 changed files with 2 additions and 2 deletions
  1. 2 2
      editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp

+ 2 - 2
editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp

@@ -113,10 +113,10 @@ void Camera3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id,
 		camera->set("fov", CLAMP(a * 2.0, 1, 179));
 		camera->set("fov", CLAMP(a * 2.0, 1, 179));
 	} else {
 	} else {
 		Camera3D::KeepAspect aspect = camera->get_keep_aspect_mode();
 		Camera3D::KeepAspect aspect = camera->get_keep_aspect_mode();
-		Vector3 far = aspect == Camera3D::KeepAspect::KEEP_WIDTH ? Vector3(4096, 0, -1) : Vector3(0, 4096, -1);
+		Vector3 camera_far = aspect == Camera3D::KeepAspect::KEEP_WIDTH ? Vector3(4096, 0, -1) : Vector3(0, 4096, -1);
 
 
 		Vector3 ra, rb;
 		Vector3 ra, rb;
-		Geometry3D::get_closest_points_between_segments(Vector3(0, 0, -1), far, s[0], s[1], ra, rb);
+		Geometry3D::get_closest_points_between_segments(Vector3(0, 0, -1), camera_far, s[0], s[1], ra, rb);
 		float d = aspect == Camera3D::KeepAspect::KEEP_WIDTH ? ra.x * 2 : ra.y * 2;
 		float d = aspect == Camera3D::KeepAspect::KEEP_WIDTH ? ra.x * 2 : ra.y * 2;
 		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
 		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
 			d = Math::snapped(d, Node3DEditor::get_singleton()->get_translate_snap());
 			d = Math::snapped(d, Node3DEditor::get_singleton()->get_translate_snap());