1 files changed, 19 insertions, 14 deletions

diff --git a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
index 5ca21921..ac9efb10 100644
--- a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
+++ b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
@@ -1108,15 +1108,12 @@ QString CStudioApp::GetPasteType()
 
 bool CStudioApp::CanChangeTimebarColor()
 {
-    bool theRetVal = true;
-    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = m_core->GetDoc()->GetSelectedInstance();
-    if (!theSelectedInstance.Valid()
-            || m_core->GetDoc()->GetStudioSystem()->GetClientDataModelBridge()->IsSceneInstance(
-                theSelectedInstance)) {
-        theRetVal = false;
+    auto theSelectedInstance = m_core->GetDoc()->GetSelectedInstance();
+    if (theSelectedInstance.Valid()) {
+        auto bridge = m_core->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
+        return !bridge->IsActiveComponent(theSelectedInstance);
     }
-
-    return theRetVal;
+    return false;
 }
 
 /**
@@ -1571,6 +1568,13 @@ bool CStudioApp::OnLoadDocument(const QString &inDocument, bool inShowStartupDia
         }
     } else {
         m_dialogs->ResetSettings(loadFile);
+        if (m_core->GetDoc()->ensureActiveCamera())
+            m_dialogs->DisplayMessageBox(
+                        tr("More than one camera active"),
+                        tr("Layer can only have one active camera. "
+                           "Additional cameras were set to inactive."),
+                        Qt3DSMessageBox::ICON_WARNING, false);
+
         m_core->getProjectFile().updateDocPresentationId();
         m_core->getProjectFile().loadSubpresentationsAndDatainputs(m_subpresentations,
                                                                    m_dataInputDialogItems);
@@ -1631,12 +1635,6 @@ void CStudioApp::saveDataInputsToProjectFile()
             } else if (item->type == EDataType::DataTypeVariant) {
                 diNode.setAttribute(QStringLiteral("type"), QStringLiteral("Variant"));
             }
-#ifdef DATAINPUT_EVALUATOR_ENABLED
-            else if (item->type == EDataType::DataTypeEvaluator) {
-                diNode.setAttribute(QStringLiteral("type"), QStringLiteral("Evaluator"));
-                diNode.setAttribute(QStringLiteral("evaluator"), item->valueString);
-            }
-#endif
 
             QHashIterator<QString, QString> it(item->metadata);
             QString metadataStr;
@@ -2062,6 +2060,13 @@ void CStudioApp::showPresentationIdEmptyWarning()
                                  Qt3DSMessageBox::ICON_WARNING, false);
 }
 
+void CStudioApp::showShaderCompileError(const QString &error)
+{
+    m_dialogs->DisplayMessageBox(tr("Warning"),
+                                 tr("Shader compile error.\n") + error,
+                                 Qt3DSMessageBox::ICON_WARNING, false);
+}
+
 void CStudioApp::showInvalidFilenameWarning()
 {
     m_dialogs->DisplayMessageBox(tr("Invalid filename"),