summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core/Core/Core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Authoring/Client/Code/Core/Core/Core.cpp')
-rw-r--r--src/Authoring/Client/Code/Core/Core/Core.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index 61ff4d3b..839031ff 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -136,12 +136,12 @@ bool CCore::LoadBuildConfigurations()
void CCore::InitAndValidateBuildConfiguration()
{
Q3DStudio::CBuildConfiguration *theConfig =
- m_BuildConfigurations.GetConfiguration(CStudioPreferences::GetPreviewConfig());
+ m_BuildConfigurations.GetConfiguration(CStudioPreferences::previewConfig());
if (!theConfig) {
Q3DStudio::CBuildConfigurations::TBuildConfigurations &theConfigurations =
m_BuildConfigurations.GetConfigurations();
if (theConfigurations.size()) {
- CStudioPreferences::SetPreviewConfig(theConfigurations.begin()->first);
+ CStudioPreferences::setPreviewConfig(theConfigurations.begin()->first);
theConfig = theConfigurations.begin()->second;
}
}
@@ -152,12 +152,13 @@ void CCore::InitAndValidateBuildConfiguration()
for (theConfigPropIter = theConfigProperties.begin();
theConfigPropIter != theConfigProperties.end(); ++theConfigPropIter) {
const QString &thePropName = theConfigPropIter->GetName();
- QString theStoredValue = CStudioPreferences::GetPreviewProperty(thePropName);
+ QString theStoredValue = CStudioPreferences::previewProperty(thePropName);
if (!theConfigPropIter->HasValue(theStoredValue)) {
// add this property in
- if (theConfigPropIter->GetAcceptableValues().size())
- CStudioPreferences::SetPreviewProperty(
+ if (theConfigPropIter->GetAcceptableValues().size()) {
+ CStudioPreferences::setPreviewProperty(
thePropName, theConfigPropIter->GetValue(0).GetName());
+ }
}
}
}
@@ -229,7 +230,9 @@ bool CCore::OnNewDocument(const QString &inDocument, bool isNewProject, bool sil
m_projectFile.ensureProjectFile();
}
+ g_StudioApp.getRenderer().MakeContextCurrent();
m_Doc->CloseDocument();
+ g_StudioApp.getRenderer().ReleaseContext();
QString theDocument = inDocument;