sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix travis

Browse Source
This commit is contained in:
Peter Petrik 2019-01-24 11:08:21 +01:00
parent 967893a637
commit c90905bd65
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mesh/qgsmeshspatialindex.cpp
View File

@ -27,6 +27,8 @@
using namespace SpatialIndex;
///@cond PRIVATE
static Region faceToRegion( const QgsMesh &mesh, int id )
{
const QgsMeshFace face = mesh.face( id );
@ -288,7 +290,7 @@ class QgsMeshSpatialIndexData : public QSharedData
};
// -------------------------------------------------------------------------
///@endcond
QgsMeshSpatialIndex::QgsMeshSpatialIndex()
{

6
tests/src/3d/testqgs3drendering.cpp
View File

@ -24,6 +24,7 @@
#include "qgssinglebandpseudocolorrenderer.h"
#include "qgsvectorlayer.h"
#include "qgsmeshlayer.h"
#include "qgsmeshrenderersettings.h"
#include "qgs3dmapscene.h"
#include "qgs3dmapsettings.h"
@ -104,6 +105,11 @@ void TestQgs3DRendering::initTestCase()
mLayerMesh = new QgsMeshLayer( dataDir + "/mesh/quad_flower.2dm", "mesh", "mdal" );
QVERIFY( mLayerMesh->isValid() );
mLayerMesh->setCrs( mLayerDtm->crs() ); // this testing mesh does not have any CRS defined originally
// disable rendering of scalar 2d datasets for now
QgsMeshRendererSettings settings = mLayerMesh->rendererSettings();
settings.setActiveScalarDataset();
settings.setActiveVectorDataset();
mLayerMesh->setRendererSettings( settings );
mProject->addMapLayer( mLayerMesh );
QgsPhongMaterialSettings meshMaterial;