diff --git a/src/core/mesh/qgsmeshspatialindex.cpp b/src/core/mesh/qgsmeshspatialindex.cpp index 6f9cfeb4b6b..037f67fbe47 100644 --- 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 index b0e9b3896d2..4144e4e86cc 100644 --- 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;