From 20225878a6c5b913c93aca7888d2634272d675a1 Mon Sep 17 00:00:00 2001 From: Chris Brunner Date: Mon, 22 Sep 2008 21:38:16 +0000 Subject: [PATCH] renamed the Windows reserved names "near" and "far" to "input_near" and "input_far" --- panda/src/grutil/geoMipTerrain.I | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/panda/src/grutil/geoMipTerrain.I b/panda/src/grutil/geoMipTerrain.I index ba2c8954c0..7458e25872 100644 --- a/panda/src/grutil/geoMipTerrain.I +++ b/panda/src/grutil/geoMipTerrain.I @@ -305,10 +305,10 @@ set_factor(float factor) { // Description: Sets the near and far LOD distances in one call. //////////////////////////////////////////////////////////////////// INLINE void GeoMipTerrain:: -set_near_far(double near, double far) { +set_near_far(double input_near, double input_far) { _use_near_far = true; - _near = near; - _far = far; + _near = input_near; + _far = input_far; } //////////////////////////////////////////////////////////////////// @@ -319,9 +319,9 @@ set_near_far(double near, double far) { // This distance is in the terrain's coordinate space! //////////////////////////////////////////////////////////////////// INLINE void GeoMipTerrain:: -set_near(double near) { +set_near(double input_near) { _use_near_far = true; - _near = near; + _near = input_near; } //////////////////////////////////////////////////////////////////// @@ -332,9 +332,9 @@ set_near(double near) { // This distance is in the terrain's coordinate space! //////////////////////////////////////////////////////////////////// INLINE void GeoMipTerrain:: -set_far(double far) { +set_far(double input_far) { _use_near_far = true; - _far = far; + _far = input_far; } ////////////////////////////////////////////////////////////////////