QmlDesigner: Change default material preview env to studio env

Since "Default" option is no longer default, it was changed to "Basic"

Change-Id: I8654efbd98fe62f6c4817141fc8559757f5e58e8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 3e17d8eed406ad1fecdee26d9276e1d007c0c0ea)
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

3 files changed, 14 insertions, 12 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
index 12fdd3048e..ed44b85559 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
@@ -29,7 +29,8 @@ View3D {
     id: root
     anchors.fill: parent
     environment: sceneEnv
-    camera: envMode === "SkyBox" && envValue === "preview_studio" ? studioCamera : defaultCamera
+    camera: !envMode || (envMode === "SkyBox" && envValue === "preview_studio") ? studioCamera
+                                                                                : defaultCamera
 
     property Material previewMaterial
     property string envMode
@@ -46,15 +47,16 @@ View3D {
         antialiasingMode: SceneEnvironment.MSAA
         antialiasingQuality: SceneEnvironment.High
         backgroundMode: envMode === "Color" ? SceneEnvironment.Color
-                                            : envMode === "SkyBox" ? SceneEnvironment.SkyBox
-                                                                   : SceneEnvironment.Transparent
+                                            : envMode === "Basic" ? SceneEnvironment.Transparent
+                                                                  : SceneEnvironment.SkyBox
         clearColor: envMode === "Color" ? envValue : "#000000"
-        lightProbe: envMode === "SkyBox" ? skyBoxTex : null
+        lightProbe: !envMode || envMode === "SkyBox" ? skyBoxTex : null
 
         Texture {
             id: skyBoxTex
-            source: envMode === "SkyBox" ? "../images/" + envValue + ".hdr"
-                                         : ""
+            source: !envMode ? "../images/preview_studio.hdr"
+                             : envMode === "SkyBox" ? "../images/" + envValue + ".hdr"
+                                                    : ""
         }
     }
 
@@ -62,7 +64,7 @@ View3D {
         DirectionalLight {
             eulerRotation.x: -26
             eulerRotation.y: modelSrc === "#Cube" ? -10 : -50
-            brightness: envMode !== "SkyBox" ? 1 : 0
+            brightness: envMode && envMode !== "SkyBox" ? 1 : 0
         }
 
         PerspectiveCamera {
@@ -106,7 +108,7 @@ View3D {
             scale.y: 8
             scale.x: 8
             eulerRotation.x: -60
-            visible: !envMode || envMode === "Default"
+            visible: envMode === "Basic"
             materials: floorMaterial
             DefaultMaterial {
                 id: floorMaterial
diff --git a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml
index 80ac9b2aac..afc4be5186 100644
--- a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml
+++ b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml
@@ -111,8 +111,8 @@ Column {
         ListModel {
             id: envMenuModel
             ListElement {
-                envName: qsTr("Default")
-                envStr: "Default"
+                envName: qsTr("Basic")
+                envStr: "Basic"
             }
             ListElement {
                 envName: qsTr("Color")
diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
index 1a3ab43763..e592548c68 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
@@ -647,12 +647,12 @@ void MaterialEditorView::initPreviewData()
         QString env = rootModelNode().auxiliaryData("matPrevEnv").toString();
         QString envValue = rootModelNode().auxiliaryData("matPrevEnvValue").toString();
         QString modelStr = rootModelNode().auxiliaryData("matPrevModel").toString();
-        if (!envValue.isEmpty() && env != "Color" && env != "Default") {
+        if (!envValue.isEmpty() && env != "Color" && env != "Basic") {
             env += '=';
             env += envValue;
         }
         if (env.isEmpty())
-            env = "Default";
+            env = "SkyBox=preview_studio";
         if (modelStr.isEmpty())
             modelStr = "#Sphere";
         m_initializingPreviewData = true;