asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #11712 from BastiaanOlij/fix_windows_reserved_far_near

Browse source 
near and far are reserved for near and far pointers in MSVC
This commit is contained in:
Juan Linietsky 2017-09-30 08:01:03 -03:00 committed by GitHub
commit 313b1a639c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gles3/rasterizer_scene_gles3.cpp
View file

@ -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;