diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-09-30 08:01:03 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 08:01:03 -0300 |
| commit | 313b1a639c808677ee4bdca83e35ce645a23d1a2 (patch) | |
| tree | 1c3f3d26030095a6e39069aa43cd1292a0cda013 /drivers/gles3/rasterizer_scene_gles3.cpp | |
| parent | 854afba672811ce9329e5b9d2cf78aa52c07745b (diff) | |
| parent | cf56711a7ee9e67acf41472453e44f955b457ed7 (diff) | |
Merge pull request #11712 from BastiaanOlij/fix_windows_reserved_far_near
near and far are reserved for near and far pointers in MSVC
Diffstat (limited to 'drivers/gles3/rasterizer_scene_gles3.cpp')
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index ecbd70496c..0ce6c73f92 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -2369,11 +2369,11 @@ void RasterizerSceneGLES3::_draw_sky(RasterizerStorageGLES3::Sky *p_sky, const C if (p_custom_fov) { - float near = p_projection.get_z_near(); - float far = p_projection.get_z_far(); + float near_plane = p_projection.get_z_near(); + float far_plane = p_projection.get_z_far(); float aspect = p_projection.get_aspect(); - camera.set_perspective(p_custom_fov, aspect, near, far); + camera.set_perspective(p_custom_fov, aspect, near_plane, far_plane); } else { camera = p_projection; |