Ensure materials are listed in a nice order

qgis · Nov 13, 2020 · c214428 · c214428
1 parent 2dcbf95
commit c214428
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/3d/materials/qgsmaterialregistry.cpp b/src/3d/materials/qgsmaterialregistry.cpp
@@ -31,6 +31,7 @@ bool QgsMaterialRegistry::addMaterialSettingsType( QgsMaterialSettingsAbstractMe
     return false;
 
   mMetadata[metadata->type()] = metadata;
+  mMaterialsOrder << metadata->type();
   return true;
 }
 
@@ -49,5 +50,11 @@ QgsMaterialSettingsAbstractMetadata *QgsMaterialRegistry::materialSettingsMetada
 
 QStringList QgsMaterialRegistry::materialSettingsTypes() const
 {
-  return mMetadata.keys();
+  QStringList types;
+  for ( const QString &material : mMaterialsOrder )
+  {
+    if ( mMetadata.value( material ) )
+      types << material;
+  }
+  return types;
 }
diff --git a/src/3d/materials/qgsmaterialregistry.h b/src/3d/materials/qgsmaterialregistry.h
@@ -220,6 +220,8 @@ class _3D_EXPORT QgsMaterialRegistry
 #endif
 
     QMap<QString, QgsMaterialSettingsAbstractMetadata *> mMetadata;
+    //! List of materials, maintained in the order that they have been added
+    QStringList mMaterialsOrder;
 };