diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-28 15:40:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 15:40:48 +0100 |
| commit | 1a86a4b291348cf5a339defe99fb5cf79d90d7cd (patch) | |
| tree | 619e4e2e5120cfd08a5cd61607315df5f562dd3b | |
| parent | 8f4c4bb6106e11d4c6fe1d37e5ad294474f6bb0d (diff) | |
| parent | 01d0360580210b1538f74cd402962fbe1925676d (diff) | |
| download | redot-engine-1a86a4b291348cf5a339defe99fb5cf79d90d7cd.tar.gz | |
Merge pull request #44758 from madmiraal/fix-camera-merge
Fix GLTF after camera near and far rename merge
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 3adeaefbaf..5eaa1741ea 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -4888,12 +4888,12 @@ GLTFCameraIndex GLTFDocument::_convert_camera(Ref<GLTFState> state, Camera3D *p_ if (p_camera->get_projection() == Camera3D::Projection::PROJECTION_PERSPECTIVE) { c->set_perspective(true); c->set_fov_size(p_camera->get_fov()); - c->set_zfar(p_camera->get_zfar()); - c->set_znear(p_camera->get_znear()); + c->set_zfar(p_camera->get_far()); + c->set_znear(p_camera->get_near()); } else { c->set_fov_size(p_camera->get_fov()); - c->set_zfar(p_camera->get_zfar()); - c->set_znear(p_camera->get_znear()); + c->set_zfar(p_camera->get_far()); + c->set_znear(p_camera->get_near()); } GLTFCameraIndex camera_index = state->cameras.size(); state->cameras.push_back(c); |