From 40f21abf7a582f5fc484c5273b62b1d68aab21bf Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 29 Jul 2020 06:51:59 +1000
Subject: [PATCH] Move initialization to Qgs3DAppUtils

---
 src/app/3d/qgs3dapputils.cpp | 3 +++
 src/app/qgisapp.cpp          | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/3d/qgs3dapputils.cpp b/src/app/3d/qgs3dapputils.cpp
index 955b86af126..ab6462d79a7 100644
--- 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
index d88b312f4b9..bb3f92fd3a9 100644
--- 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