Prevent setting renderables to effect/material Texture properties

Task-number: QT3DS-2121
Change-Id: I291c9505a99149ab1397265f4cc0a172ac8a39f0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

4 files changed, 9 insertions, 5 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.cpp b/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.cpp
index 897c07cd..958112c9 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.cpp
@@ -29,8 +29,9 @@
 #include "ImageChooserModel.h"
 #include "StudioApp.h"
 
-ImageChooserModel::ImageChooserModel(QObject *parent)
+ImageChooserModel::ImageChooserModel(bool showRenderables, QObject *parent)
     : ChooserModelBase(parent)
+    , m_showRenderables(showRenderables)
 {
 }
 
@@ -40,7 +41,8 @@ ImageChooserModel::~ImageChooserModel()
 
 bool ImageChooserModel::isVisible(const QString &path) const
 {
-    return getIconType(path) == OBJTYPE_IMAGE || !g_StudioApp.getRenderableId(path).isEmpty();
+    return getIconType(path) == OBJTYPE_IMAGE
+            || (m_showRenderables && !g_StudioApp.getRenderableId(path).isEmpty());
 }
 
 const QVector<ChooserModelBase::FixedItem> ImageChooserModel::getFixedItems() const
diff --git a/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.h b/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.h
index ee5b5806..0a87f3a1 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/ImageChooserModel.h
@@ -36,13 +36,15 @@ class ImageChooserModel : public ChooserModelBase
     Q_OBJECT
 
 public:
-    explicit ImageChooserModel(QObject *parent = nullptr);
+    explicit ImageChooserModel(bool showRenderables, QObject *parent = nullptr);
     virtual ~ImageChooserModel();
 
 private:
     bool isVisible(const QString &path) const override;
     const QVector<FixedItem> getFixedItems() const override;
     QString specialDisplayName(const TreeItem &item) const override;
+
+    bool m_showRenderables = false;
 };
 
 #endif // IMAGECHOOSERMODEL_H
diff --git a/src/Authoring/Studio/Palettes/Inspector/ImageChooserView.cpp b/src/Authoring/Studio/Palettes/Inspector/ImageChooserView.cpp
index b46acdca..68b780a7 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ImageChooserView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ImageChooserView.cpp
@@ -45,7 +45,7 @@
 
 ImageChooserView::ImageChooserView(QWidget *parent)
     : QQuickWidget(parent)
-    , m_model(new ImageChooserModel(this))
+    , m_model(new ImageChooserModel(true, this))
 {
     setWindowTitle(tr("Images"));
     setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
diff --git a/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp b/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
index 5a1eaa2c..dda078f2 100644
--- a/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
@@ -45,7 +45,7 @@
 
 TextureChooserView::TextureChooserView(QWidget *parent)
     : QQuickWidget(parent)
-    , m_model(new ImageChooserModel(this))
+    , m_model(new ImageChooserModel(false, this))
 {
     setWindowTitle(tr("Texture"));
     setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);