Merge pull request #39749 from aaronfranke/nan-editor-camera

Avoid errors when the editor camera is inside the focused object
This commit is contained in:
Rémi Verschelde 2020-06-22 11:38:09 +02:00 committed by GitHub
commit 417d15a23a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3208,7 +3208,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
Vector3 camz = -camera_xform.get_basis().get_axis(2).normalized();
Vector3 camy = -camera_xform.get_basis().get_axis(1).normalized();
Plane p(camera_xform.origin, camz);
float gizmo_d = Math::abs(p.distance_to(xform.origin));
float gizmo_d = MAX(Math::abs(p.distance_to(xform.origin)), CMP_EPSILON);
float d0 = camera->unproject_position(camera_xform.origin + camz * gizmo_d).y;
float d1 = camera->unproject_position(camera_xform.origin + camz * gizmo_d + camy).y;
float dd = Math::abs(d0 - d1);