Skip to content

Commit

Permalink
fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterPetrik committed Jan 24, 2019
1 parent 967893a commit c90905b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/core/mesh/qgsmeshspatialindex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

using namespace SpatialIndex;

///@cond PRIVATE

static Region faceToRegion( const QgsMesh &mesh, int id )
{
const QgsMeshFace face = mesh.face( id );
Expand Down Expand Up @@ -288,7 +290,7 @@ class QgsMeshSpatialIndexData : public QSharedData

};

// -------------------------------------------------------------------------
///@endcond

QgsMeshSpatialIndex::QgsMeshSpatialIndex()
{
Expand Down
6 changes: 6 additions & 0 deletions tests/src/3d/testqgs3drendering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "qgssinglebandpseudocolorrenderer.h"
#include "qgsvectorlayer.h"
#include "qgsmeshlayer.h"
#include "qgsmeshrenderersettings.h"

#include "qgs3dmapscene.h"
#include "qgs3dmapsettings.h"
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c90905b

Please sign in to comment.