Skip to content

Commit

Permalink
Fix crash when using older 3d line symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 3, 2020
1 parent 88b3f43 commit 4a03d3c
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/3d/symbols/qgsline3dsymbol_p.cpp
Expand Up @@ -28,6 +28,7 @@
#include "qgsmultilinestring.h"
#include "qgsmultipolygon.h"
#include "qgsgeos.h"
#include "qgssimplelinematerialsettings.h"

#include "qgsphongtexturedmaterialsettings.h"

Expand Down Expand Up @@ -398,6 +399,12 @@ void QgsThickLine3DSymbolHandler::makeEntity( Qt3DCore::QEntity *parent, const Q
materialContext.setIsSelected( selected );
materialContext.setSelectionColor( context.map().selectionColor() );
Qt3DRender::QMaterial *mat = mSymbol.material()->toMaterial( QgsMaterialSettingsRenderingTechnique::Lines, materialContext );
if ( !mat )
{
QgsSimpleLineMaterialSettings defaultMaterial;
mat = defaultMaterial.toMaterial( QgsMaterialSettingsRenderingTechnique::Lines, materialContext );
}

if ( QgsLineMaterial *lineMaterial = dynamic_cast< QgsLineMaterial * >( mat ) )
lineMaterial->setLineWidth( mSymbol.width() );

Expand Down

0 comments on commit 4a03d3c

Please sign in to comment.