From cf56711a7ee9e67acf41472453e44f955b457ed7 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Sat, 30 Sep 2017 10:43:34 +1000 Subject: near and far are reserved for near and far pointers in MSVR --- drivers/gles3/rasterizer_scene_gles3.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gles3/rasterizer_scene_gles3.cpp') 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; -- cgit v1.2.3