1 files changed, 16 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index ecef2598..dd3212ac 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -134,10 +134,14 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
         QtMessageHandler handler = qInstallMessageHandler(discardDebugMsgs);
 
         m_funcs_2_1 = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_1>();
-        m_funcs_2_1->initializeOpenGLFunctions();
+        if (m_funcs_2_1)
+            m_funcs_2_1->initializeOpenGLFunctions();
 
         // Restore original message handler
         qInstallMessageHandler(handler);
+
+        if (!m_funcs_2_1)
+            qFatal("OpenGL version is too low, at least 2.1 is required");
     }
 #endif
     QObject::connect(m_drawer, &Drawer::drawerChanged, this, &Abstract3DRenderer::updateTextures);
@@ -496,6 +500,11 @@ void Abstract3DRenderer::handleShadowQualityChange()
 {
     reInitShaders();
 
+    if (m_cachedScene->activeLight()->isAutoPosition()
+            || m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
+        m_cachedScene->d_ptr->setLightPositionRelativeToCamera(defaultLightPos);
+        emit needRender();
+    }
     if (m_isOpenGLES && m_cachedShadowQuality != QAbstract3DGraph::ShadowQualityNone) {
         emit requestShadowQuality(QAbstract3DGraph::ShadowQualityNone);
         qWarning("Shadows are not yet supported for OpenGL ES2");
@@ -1990,8 +1999,12 @@ void Abstract3DRenderer::updateCameraViewport()
         m_oldCameraTarget = adjustedTarget;
     }
     m_cachedScene->activeCamera()->d_ptr->updateViewMatrix(m_autoScaleAdjustment);
-    // Set light position (i.e rotate light with activeCamera, a bit above it)
-    m_cachedScene->d_ptr->setLightPositionRelativeToCamera(defaultLightPos);
+    // Set light position (i.e rotate light with activeCamera, a bit above it).
+    // Check if we want to use automatic light positioning even without shadows
+    if (m_cachedScene->activeLight()->isAutoPosition()
+            || m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
+        m_cachedScene->d_ptr->setLightPositionRelativeToCamera(defaultLightPos);
+    }
 }
 
 QT_END_NAMESPACE_DATAVISUALIZATION