瀏覽代碼

Merge pull request #11712 from BastiaanOlij/fix_windows_reserved_far_near

near and far are reserved for near and far pointers in MSVC
Juan Linietsky 8 年之前
父節點
當前提交
313b1a639c
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/gles3/rasterizer_scene_gles3.cpp

+ 3 - 3
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;