- Timestamp:
- 12/18/08 12:06:57 (4 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.cpp
r9358 r9388 284 284 285 285 286 float minHeight = 0.0;286 //float minHeight = 0.0; 287 287 float scaleHeight = _terrainTile->getTerrain() ? _terrainTile->getTerrain()->getVerticalScale() : 1.0f; 288 288 … … 312 312 { 313 313 if (switchLayer->getActiveLayer()>=0 && 314 s witchLayer->getActiveLayer()<switchLayer->getNumLayers() &&314 static_cast<unsigned int>(switchLayer->getActiveLayer())<switchLayer->getNumLayers() && 315 315 switchLayer->getLayer(switchLayer->getActiveLayer())) 316 316 { … … 698 698 if (switchLayer) 699 699 { 700 if (switchLayer->getActiveLayer()<0 || switchLayer->getActiveLayer()>=switchLayer->getNumLayers()) 700 if (switchLayer->getActiveLayer()<0 || 701 static_cast<unsigned int>(switchLayer->getActiveLayer())>=switchLayer->getNumLayers()) 701 702 { 702 703 continue;
