[osgearth] 02/05: Merge tag 'upstream/2.9_rc3+dfsg' into experimental

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository osgearth.

commit 12ecb1251816f7fa949a734198300fd2c1fce574
Merge: e0c952b 0d45333
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 2 07:22:32 2018 +0100

    Merge tag 'upstream/2.9_rc3+dfsg' into experimental
    
    Upstream version 2.9~rc3+dfsg

 src/osgEarth/ImageUtils                            |  13 +
 src/osgEarth/ImageUtils.cpp                        |  76 ++
 src/osgEarth/MapNode                               |   4 +
 src/osgEarth/MapNode.cpp                           |  26 +
 src/osgEarth/ModelLayer.cpp                        |   4 -
 src/osgEarth/TerrainLayer                          |   3 +
 src/osgEarth/Version                               |   2 +-
 src/osgEarth/VirtualProgram                        |  10 +-
 src/osgEarth/VirtualProgram.cpp                    |  34 +-
 .../cache_leveldb/LevelDBCacheBin.cpp              |   2 +-
 .../cache_rocksdb/RocksDBCacheBin.cpp              |   2 +-
 src/osgEarthDrivers/engine_mp/MPGeometry           |   4 +-
 src/osgEarthDrivers/engine_mp/MPGeometry.cpp       |   8 +-
 src/osgEarthDrivers/engine_rex/GeometryPool        |   4 +
 src/osgEarthDrivers/engine_rex/GeometryPool.cpp    | 281 ++++---
 src/osgEarthDrivers/engine_rex/MaskGenerator       |  41 +-
 src/osgEarthDrivers/engine_rex/MaskGenerator.cpp   | 700 ++++++++++------
 .../engine_rex/RexEngine.elevation.glsl            |   2 +-
 .../engine_rex/RexTerrainEngineNode                |   4 +
 .../engine_rex/RexTerrainEngineNode.cpp            |  40 +
 src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp  |  15 +-
 src/osgEarthSymbology/Geometry.cpp                 |   6 +
 src/osgEarthUtil/Controls.cpp                      |   2 +
 src/osgEarthUtil/TopologyGraph                     | 101 ++-
 src/osgEarthUtil/TopologyGraph.cpp                 | 908 ++++-----------------
 25 files changed, 1068 insertions(+), 1224 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git