summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp5
-rw-r--r--src/Authoring/Qt3DStudio/MainFrm.cpp4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
index c340ff32..f4157e7c 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
@@ -452,7 +452,10 @@ void CStudioPreferences::setHelperGridOn(bool showGrid)
bool CStudioPreferences::isAxisHelperOn()
{
- return s_preferences.value(QStringLiteral("VisualAids/ShowAxisHelper"), true).toBool();
+ return false;
+ // Disable axis helper (QT3DS-4122). To be re-enabled (QT3DS-4124), thoroughly tested
+ // and bugs fixed after 2.7 is released.
+ //return s_preferences.value(QStringLiteral("VisualAids/ShowAxisHelper"), true).toBool();
}
void CStudioPreferences::setAxisHelperOn(bool showAxisHelper)
diff --git a/src/Authoring/Qt3DStudio/MainFrm.cpp b/src/Authoring/Qt3DStudio/MainFrm.cpp
index 8a868d23..377260c1 100644
--- a/src/Authoring/Qt3DStudio/MainFrm.cpp
+++ b/src/Authoring/Qt3DStudio/MainFrm.cpp
@@ -252,6 +252,10 @@ CMainFrame::CMainFrame()
m_ui->actionToggle_hide_unhide_unselected->setVisible(false);
m_ui->actionFind->setVisible(false);
+ // Hide axis helper (QT3DS-4122). To be re-enabled (QT3DS-4124), thoroughly tested and bugs
+ // fixed after 2.7 is released.
+ m_ui->actionAxis_Helper->setVisible(false);
+
// TODO: better solution?
m_updateUITimer->start(500);
connect(m_updateUITimer.data(), &QTimer::timeout, [&]() {