fix travis

PeterPetrik · PeterPetrik · commit c90905bd65bc · 2019-01-24T16:24:46.000+01:00
diff --git a/src/core/mesh/qgsmeshspatialindex.cpp b/src/core/mesh/qgsmeshspatialindex.cpp
@@ -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()
 {
diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`
`28`	`28`	`using namespace SpatialIndex;`
`29`	`29`
	`30`	`+///@cond PRIVATE`
	`31`	`+`
`30`	`32`	`static Region faceToRegion( const QgsMesh &mesh, int id )`
`31`	`33`	`{`
`32`	`34`	`const QgsMeshFace face = mesh.face( id );`
`@@ -288,7 +290,7 @@ class QgsMeshSpatialIndexData : public QSharedData`
`288`	`290`
`289`	`291`	`};`
`290`	`292`
`291`		`-// -------------------------------------------------------------------------`
	`293`	`+///@endcond`
`292`	`294`
`293`	`295`	`QgsMeshSpatialIndex::QgsMeshSpatialIndex()`
`294`	`296`	`{`