Move initialization to Qgs3DAppUtils

This commit is contained in:
Nyall Dawson 2020-07-29 06:51:59 +10:00
parent 1484a30fef
commit 40f21abf7a
2 changed files with 3 additions and 2 deletions

View File

@ -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() ) );
}

View File

@ -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