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

diff --git a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
index c0a21750..92e5a516 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
@@ -83,7 +83,10 @@ QVariant ChooserModelBase::data(const QModelIndex &index, int role) const
 
         switch (role) {
         case Qt::DecorationRole:
-            return resourceImageUrl() + CStudioObjectTypes::GetNormalIconName(item.iconType);
+            if (!item.iconSource.isEmpty())
+                return resourceImageUrl() + item.iconSource;
+            else
+                return resourceImageUrl() + CStudioObjectTypes::GetNormalIconName(item.iconType);
 
         case IsExpandableRole:
             return false;