Move initialization to Qgs3DAppUtils

qgis · Jul 29, 2020 · 40f21ab · 40f21ab
1 parent 1484a30
commit 40f21ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/3d/qgs3dapputils.cpp b/src/app/3d/qgs3dapputils.cpp
@@ -22,6 +22,7 @@
 #include "qgspolygon3dsymbolwidget.h"
 #include "qgsline3dsymbolwidget.h"
 #include "qgsphongmaterialwidget.h"
+#include "qgs3dicongenerator.h"
 
 void Qgs3DAppUtils::initialize()
 {
@@ -30,4 +31,6 @@ void Qgs3DAppUtils::initialize()
   dynamic_cast< Qgs3DSymbolMetadata * >( QgsApplication::symbol3DRegistry()->symbolMetadata( QStringLiteral( "polygon" ) ) )->setWidgetFunction( QgsPolygon3DSymbolWidget::create );
 
   dynamic_cast< QgsMaterialSettingsMetadata * >( Qgs3D::materialRegistry()->materialSettingsMetadata( QStringLiteral( "phong" ) ) )->setWidgetFunction( QgsPhongMaterialWidget::create );
+
+  QgsStyleModel::setIconGenerator( new Qgs3DIconGenerator( QgsApplication::defaultStyleModel() ) );
 }
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -12657,8 +12657,6 @@ void QgisApp::init3D()
   // initialize 3D registries
   Qgs3D::initialize();
   Qgs3DAppUtils::initialize();
-
-  QgsStyleModel::setIconGenerator( new Qgs3DIconGenerator( QgsApplication::defaultStyleModel() ) );
 #else
   mActionNew3DMapCanvas->setVisible( false );
 #endif