Use correct icons in mesh selector1.1

Allows setting custom icon for choosers.

Task-number: QT3DS-195
Change-Id: Iec1d7fd3cf6ebcfaabba222609ec90d86069c9ab
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp b/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp
index e1b61bbf..f87dc89b 100644
--- a/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp
@@ -31,6 +31,7 @@
 #include "Doc.h"
 #include "IDocumentBufferCache.h"
 #include "StudioApp.h"
+#include "BasicObjectsModel.h"
 
 MeshChooserModel::MeshChooserModel(QObject *parent)
     : ChooserModelBase(parent)
@@ -52,11 +53,13 @@ const QVector<ChooserModelBase::FixedItem> MeshChooserModel::getFixedItems() con
     static QVector<FixedItem> items;
 
     if (items.isEmpty()) {
-        auto primitiveNames = g_StudioApp.GetCore()->GetDoc()->GetBufferCache().GetPrimitiveNames();
-        for (auto item = primitiveNames; *item; ++item) {
-            auto itemName = *item;
+        auto primitives = BasicObjectsModel::BasicMeshesModel();
+        CDoc *doc = g_StudioApp.GetCore()->GetDoc();
+        for (int i = 0; i < primitives.size(); i++) {
+            auto item = primitives.at(i);
+            const wchar_t *itemName = doc->GetBufferCache().GetPrimitiveName(item.primitiveType());
             if (itemName[0] == L'#')
-                items.append({ OBJTYPE_MODEL, QString::fromWCharArray(itemName + 1) });
+                items.append({ OBJTYPE_MODEL, item.icon(), QString::fromWCharArray(itemName + 1) });
         }
     }