Merge branch '2.10'

Oeagrus · Apr 23, 2019 · a75d387 · a75d387
2 parents 6b8e67a + e5794ac
commit a75d387
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ PROJECT(OSGEARTH)
 
 SET(OSGEARTH_MAJOR_VERSION 2)
 SET(OSGEARTH_MINOR_VERSION 10)
-SET(OSGEARTH_PATCH_VERSION 0)
+SET(OSGEARTH_PATCH_VERSION 1)
 SET(OSGEARTH_SOVERSION     0)
 
 SET(OSGEARTH_PLUGIN_PREFIX "")

diff --git a/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp b/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp
@@ -243,7 +243,8 @@ SurfaceNode::computeBound() const
 float
 SurfaceNode::getPixelSizeOnScreen(osg::CullStack* cull) const
 {
-    return cull->clampedPixelSize(getMatrix().getTrans(), _drawable->getRadius()) / cull->getLODScale();
+    double R = _drawable->getRadius() / 1.4142;
+    return cull->clampedPixelSize(getMatrix().getTrans(), R) / cull->getLODScale();
 }
 
 void