summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBastiaan Olij <mux213@gmail.com>2017-09-30 10:43:34 +1000
committerBastiaan Olij <mux213@gmail.com>2017-09-30 10:43:34 +1000
commitcf56711a7ee9e67acf41472453e44f955b457ed7 (patch)
tree4ed1e5ccb62d7db3990003bfc2982cf4355eea5c /drivers
parentf494470005675a03584308d850307bf3c1fd568e (diff)
near and far are reserved for near and far pointers in MSVR
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gles3/rasterizer_scene_gles3.cpp6
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;