Merge branch 'master' into wip/timeline

This merge loses datainput functionality in timeline toolbar.
It needs to be readded in a separate commit.

Change-Id: I92ca36e87718e9451b589465eb7ebbd801932820

2 files changed, 15 insertions, 7 deletions

diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
index 11b5892b..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},
@@ -54,15 +59,15 @@ void BasicObjectsModel::initialize()
         {tr("Camera"), "Asset-Camera-Normal.png"_L1, OBJTYPE_CAMERA, PRIMITIVETYPE_UNKNOWN},
         {tr("Light"), "Asset-Light-Normal.png"_L1, OBJTYPE_LIGHT, PRIMITIVETYPE_UNKNOWN},
         {tr("Alias"), "Asset-Alias-Normal.png"_L1, OBJTYPE_ALIAS, PRIMITIVETYPE_UNKNOWN},
-        // For now, adding Datainput (and Layer) is done by drag-drop. TODO: remove after a separate
-        // panel for adding these metaobjects exists
-
-        // Master control for adding datainput functionality to studio, uncomment to enable adding
-        // datainput
-        // {tr("Datainput"), "Objects-DataInput-Normal.png"_L1, OBJTYPE_DATAINPUT, PRIMITIVETYPE_UNKNOWN}
     };
 }
 
+// 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()))
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h
index 1f0edbf9..2e2faa83 100644
--- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h
+++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h
@@ -88,8 +88,11 @@ public:
     QStringList mimeTypes() const override;
     QMimeData *mimeData(const QModelIndexList &indexes) const override;
 
+    static const QVector<BasicObjectItem> BasicMeshesModel();
+
 private:
     void initialize();
+    static const QVector<BasicObjectItem> InitializeObjectModel();
 
     QVector<BasicObjectItem> m_ObjectItems;