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, 12 insertions, 1 deletions

diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
index 0888063d..5a4fff9d 100644
--- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
+++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
@@ -42,7 +42,12 @@ BasicObjectsModel::BasicObjectsModel(QObject *parent) : QAbstractListModel(paren
 
 void BasicObjectsModel::initialize()
 {
-    m_ObjectItems = {
+    m_ObjectItems = InitializeObjectModel();
+}
+
+const QVector<BasicObjectItem> BasicObjectsModel::InitializeObjectModel()
+{
+    return {
         {tr("Rectangle"), "Asset-Rectangle-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_RECT},
         {tr("Sphere"), "Asset-Sphere-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_SPHERE},
         {tr("Cube"), "Asset-Cube-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_BOX},
@@ -57,6 +62,12 @@ void BasicObjectsModel::initialize()
     };
 }
 
+// Returns meshes part of basic objects
+const QVector<BasicObjectItem> BasicObjectsModel::BasicMeshesModel()
+{
+    return InitializeObjectModel().mid(0, 5);
+}
+
 QVariant BasicObjectsModel::data(const QModelIndex &index, int role) const
 {
     if (!hasIndex(index.row(), index.column(),index.parent()))