Skip to content
Permalink
Browse files

Fix crash in 3d when changing symbol properties (3.14 backport)

  • Loading branch information
github-actions authored and nyalldawson committed Aug 27, 2020
1 parent 0f7e575 commit 41e0ec19b35bde484c49c5fae1f4dfa24850f402
@@ -74,7 +74,7 @@ class QgsBufferedLine3DSymbolHandler : public QgsFeature3DHandler
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &context, LineData &out, bool selected );

// input specific for this class
const QgsLine3DSymbol &mSymbol;
QgsLine3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -200,7 +200,7 @@ class QgsSimpleLine3DSymbolHandler : public QgsFeature3DHandler
Qt3DExtras::QPhongMaterial *material( const QgsLine3DSymbol &symbol ) const;

// input specific for this class
const QgsLine3DSymbol &mSymbol;
QgsLine3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -310,7 +310,7 @@ class QgsThickLine3DSymbolHandler : public QgsFeature3DHandler
Qt3DExtras::QPhongMaterial *material( const QgsLine3DSymbol &symbol ) const;

// input specific for this class
const QgsLine3DSymbol &mSymbol;
QgsLine3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -85,7 +85,7 @@ class QgsInstancedPoint3DSymbolHandler : public QgsFeature3DHandler
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &context, PointData &out, bool selected );

// input specific for this class
const QgsPoint3DSymbol &mSymbol;
QgsPoint3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -358,7 +358,7 @@ class QgsModelPoint3DSymbolHandler : public QgsFeature3DHandler
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &context, PointData &out, bool selected );

// input specific for this class
const QgsPoint3DSymbol &mSymbol;
QgsPoint3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -431,6 +431,9 @@ void QgsModelPoint3DSymbolHandler::addSceneEntities( const Qgs3DMapSettings &map

void QgsModelPoint3DSymbolHandler::addMeshEntities( const Qgs3DMapSettings &map, const QVector<QVector3D> &positions, const QgsPoint3DSymbol &symbol, Qt3DCore::QEntity *parent, bool are_selected )
{
if ( positions.empty() )
return;

// build the default material
Qt3DExtras::QPhongMaterial *mat = Qgs3DUtils::phongMaterial( symbol.material() );

@@ -490,7 +493,7 @@ class QgsPoint3DBillboardSymbolHandler : public QgsFeature3DHandler
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &context, PointData &out, bool selected );

// input specific for this class
const QgsPoint3DSymbol &mSymbol;
QgsPoint3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

@@ -62,7 +62,7 @@ class QgsPolygon3DSymbolHandler : public QgsFeature3DHandler
Qt3DExtras::QPhongMaterial *material( const QgsPolygon3DSymbol &symbol ) const;

// input specific for this class
const QgsPolygon3DSymbol &mSymbol;
QgsPolygon3DSymbol mSymbol;
// inputs - generic
QgsFeatureIds mSelectedIds;

0 comments on commit 41e0ec1

Please sign in to comment.
You can’t perform that action at this time.