diff --git a/doc/qtdesignstudio/config/style/qt5-sidebar.html b/doc/qtdesignstudio/config/style/qt5-sidebar.html
index 163ced219fa..91c948d3622 100644
--- a/doc/qtdesignstudio/config/style/qt5-sidebar.html
+++ b/doc/qtdesignstudio/config/style/qt5-sidebar.html
@@ -248,7 +248,7 @@
- Textures
@@ -435,14 +435,13 @@
- Curves
- Effect Composer
- File System
- - Material Editor and Browser
+ - Material Browser
- Navigator
- Open Documents
- Projects
- Properties
- Qt Insight
- States
- - Texture Editor
- Timeline
- Transitions
- Translations
diff --git a/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc b/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc
index 0e080889c40..ac842709c37 100644
--- a/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc
+++ b/doc/qtdesignstudio/examples/doc/FresnelExample.qdoc
@@ -7,7 +7,7 @@
\title Fresnel properties on materials
\brief Illustrates how to work with Fresnel.
- \sa {Material Editor and Browser}, {Setting image-based lighting}, {Directional Light},
+ \sa {Material Browser}, {Setting image-based lighting}, {Directional Light},
{3D models}, {Content Library}
\image fresnel-example.webp
@@ -133,7 +133,7 @@
\list 1
\li In \uicontrol {Material Browser}, double-click a material.
- \li In \uicontrol {Material Editor}, find the properties under
+ \li In \uicontrol {Properties}, find the properties under
\uicontrol {Clearcoat} and \uicontrol {Fresnel} respectively.
\endlist
@@ -142,7 +142,7 @@
To create a new material with Fresnel:
\list 1
- \li In \uicontrol {Material Editor}, select \imageplus.
+ \li In \uicontrol {Material Browser}, select \imageplus.
\li Edit the properties under \uicontrol {Clearcoat} and \uicontrol {Fresnel} respectively.
\endlist
diff --git a/doc/qtdesignstudio/images/select-material-property.png b/doc/qtdesignstudio/images/select-material-property.png
deleted file mode 100644
index 3202c587473..00000000000
Binary files a/doc/qtdesignstudio/images/select-material-property.png and /dev/null differ
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.webp b/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.webp
index 4b7bc1a20c9..769ba833c71 100644
Binary files a/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.webp and b/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.webp differ
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.webp b/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.webp
index 0ae680f31b6..21a0dc59812 100644
Binary files a/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.webp and b/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.webp differ
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.webp b/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.webp
index 87e60ee256a..039003c0786 100644
Binary files a/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.webp and b/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.webp differ
diff --git a/doc/qtdesignstudio/images/texture-editor.webp b/doc/qtdesignstudio/images/texture-editor.webp
deleted file mode 100644
index 092a6f0daba..00000000000
Binary files a/doc/qtdesignstudio/images/texture-editor.webp and /dev/null differ
diff --git a/doc/qtdesignstudio/src/mcus/qtdesignstudio-features-on-mcu-projects.qdoc b/doc/qtdesignstudio/src/mcus/qtdesignstudio-features-on-mcu-projects.qdoc
index 7d1730a8294..769a3befcab 100644
--- a/doc/qtdesignstudio/src/mcus/qtdesignstudio-features-on-mcu-projects.qdoc
+++ b/doc/qtdesignstudio/src/mcus/qtdesignstudio-features-on-mcu-projects.qdoc
@@ -34,12 +34,12 @@
\li Yes
\li The \uicontrol 3D view is not a part of \QUL or \QMCU.
\row
- \li \l {Material Editor and Browser}
+ \li \l {Material Browser}
\li \e {Not applicable}
\li \e {Not applicable}
\li Yes
- \li The \uicontrol {Material Editor} and \uicontrol {Material Browser} views
- are not a part of \QUL or \QMCU.
+ \li The \uicontrol {Material Browser} view
+ is not a part of \QUL or \QMCU.
\row
\li \l {Components}
\li Yes
@@ -124,12 +124,6 @@
\li \e {Not applicable}
\li Yes
\li The \uicontrol {Content Library} view is not a part of \QUL or \QMCU.
- \row
- \li \l {Texture Editor}
- \li \e {Not applicable}
- \li \e {Not applicable}
- \li Yes
- \li The \uicontrol {Texture Editor} view is not a part of \QUL or \QMCU.
\endtable
*/
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 2170bce3327..e269253bba3 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -28,14 +28,13 @@
\li \l{Curves}
\li \l{Effect Composer}
\li \l{File System}
- \li \l{Material Editor and Browser}
+ \li \l{Material Browser}
\li \l{Navigator}
\li \l{Open Documents}
\li \l{Projects}
\li \l{Properties}
\li \l{Qt Insight}
\li \l{States}
- \li \l{Texture Editor}
\li \l{Timeline}
\li \l{Transitions}
\li \l{Translations}
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index b26d9c962c4..e16c3b46ae8 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -55,7 +55,6 @@
in the \uicontrol 3D view. From the context menu you can, for example:
\list
\li Create cameras, lights, and models.
- \li Open \uicontrol {Material Editor} and edit materials.
\li Delete components.
\li Align camera views.
\endlist
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
index f235fe8ab55..18ff1918d06 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -16,7 +16,7 @@
The complexity of a shader depends on a combination of the properties that
are set on it, and the context of the scene itself.
- It is recommended that you use the \l {Material Editor and Browser} when
+ It is recommended that you use \l {Material Browser} when
working with materials, but you can also add materials using the components
library.
@@ -43,7 +43,7 @@
more information, see \l {Textures}.
You can create and modify materials in
- \uicontrol {Material Editor} and \uicontrol {Material Browser}. The availability
+ \uicontrol {Material Editor} and \uicontrol {Properties}. The availability
of the properties depends on the material type.
\image studio-qtquick-3d-default-material.webp "DefaultMaterial properties"
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index 6248521fdaf..6bda6d2abc4 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -18,7 +18,7 @@
A model component loads mesh data from a file. Modify how the
component is shaded by using materials. For more information, see
- \l {Materials and shaders} and \l {Material Editor and Browser}.
+ \l {Materials and shaders} and \l {Material Browser}.
\section1 Using a primitive 3D model
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
index 36301533153..ab22df9d78b 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
@@ -102,18 +102,18 @@
\note If the colors in your texture are not visualized
correctly, try setting the \uicontrol {Base Color}
- in \uicontrol {Material Editor} to \e {white (#ffffff)}.
+ in \uicontrol {Properties} to \e {white (#ffffff)}.
- \image studio-qtquick-3d-material-texture.webp {Material Editor}
+ \image studio-qtquick-3d-material-texture.webp {Material properties in the Properties view.}
To change the source file for the texture:
\list 1
- \li Double-click the texture in \uicontrol {Material Browser}.
- \li In \uicontrol {Texture Editor}, select \imageaddfile16px
+ \li Select the texture in \uicontrol {Material Browser}.
+ \li In \uicontrol {Properties}, select \imageaddfile16px
next to \uicontrol {Source}.
\li Select the new texture.
\li Select \uicontrol Open.
\endlist
- \image studio-qtquick-3d-texture-properties.webp {Texture Editor}
+ \image {studio-qtquick-3d-texture-properties.webp} {Texture properties in the Properties view.}
*/
diff --git a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
index d28e8aa6608..0528d30fad7 100644
--- a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2024 The Qt Company Ltd.
+// Copyright (C) 2025 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
@@ -8,59 +8,41 @@
\ingroup studio-views
- \title Material Editor and Browser
+ \title Material Browser
\brief Create and manage materials and textures.
- In the \uicontrol {Material Editor} and \uicontrol {Material Browser} views,
+ In the \uicontrol {Material Browser} view,
you create and manage materials and textures.
- \image material-editor-browser.webp "Material Editor and Browser"
+ \image {material-editor-browser.webp} {Materials and textures in the Material Browser view.}
\section1 Working with Materials
\section2 Creating a material
- To create a new material, do one of the following:
-
- \list
- \li In \uicontrol {Material Browser}, select \imageaddmaterial
+ To create a new material, select \imageaddmaterial
\imageplus
.
- \li In \uicontrol {Material Editor}, select \imageplus
- .
- \endlist
+ in the {Material Browser}.
\section2 Editing a material
- To edit a material, select it in \uicontrol{Material Browser} and edit its
- properties in \uicontrol{Material Editor}. If \uicontrol {Material Editor}
- is closed, open it in one of the following ways:
-
- \list
- \li In \uicontrol{Navigator}, right-click an object that has the material
- assigned to it and select \uicontrol {Edit Material}.
- \li In \uicontrol{Material Browser}, double-click a material.
- \endlist
+ To edit a material, double-click it in \uicontrol{Material Browser} and edit its
+ properties in the \uicontrol{Properties} view.
\section2 Assigning a material to an object
- To assign a material to a 3D object in your project, drag the material from
- \uicontrol {Material Browser} to the object in the \uicontrol Navigator or
- \uicontrol 3D view.
-
- Additionally, you can also first select the object
- in the \uicontrol Navigator or \uicontrol{3D} view, and then do one of the
- following:
+ To assign a material to a 3D object in your project, do one of the follwing:
\list
- \li In \uicontrol {Material Browser}, right-click the material and select
- \uicontrol {Apply to Selected}. If there already is any material assigned
- to the object, you can select whether to replace the material or to add
+ \li Drag the material from \uicontrol {Material Browser} to the object in
+ the \uicontrol Navigator or \uicontrol 3D view.
+ \li Select the object in the \uicontrol Navigator or \uicontrol{3D} view,
+ and then in \uicontrol {Material Browser}, right-click the material and select
+ \uicontrol {Apply to Selected}. If there already is a material assigned
+ to the object, select whether to replace the material or to add
another material to the object.
- \li In \uicontrol {Material Editor}, select
- \imageapply
- . This replaces any material already assigned to the object.
\endlist
\section2 Removing a material from an object
@@ -94,18 +76,6 @@
\note You can't copy material properties between materials of different
material types.
- \section2 Using texture maps
-
- In \QDS you can add many different texture maps to your material.
-
- To add a texture map to a material:
- \list 1
- \li Select the material in \uicontrol{Material Browser}.
- \li From \uicontrol {Assets}, drag an image to the correct map field
- in \uicontrol {Material Editor}. For example, to add a diffuse map, drag
- the image to \uicontrol{Diffuse Map} in \uicontrol{Material Editor}.
- \endlist
-
\section3 Using a reflection map for environmental mapping
To use a texture for environmental mapping, you need to set the mapping
@@ -285,17 +255,16 @@
\uicontrol {Create new texture}.
\endlist
- \note You can also create textures from the \l {Assets} or
- \l {Texture Editor} views.
-
\section2 Applying a texture to a material
- To apply a texture to a material, select the material in
- \uicontrol {Material Browser} and do one of the following:
+ To apply a texture to a material, do one of the following:
+
\list
- \li Right-click the texture and select
- \uicontrol {Apply to selected material}.
- \li Drag the texture to a supported property in the
- \uicontrol {Material Editor}
+ \li From \uicontrol {Assets}, \uicontrol {Content Library}, or
+ \uicontrol {Material Browser}, drag a texture to a material in
+ \uicontrol {Material Browser} or to a 3D object in the \uicontrol {3D}
+ or \uicontrol {Navigator} view.
+ \li In \uicontrol {Material Browser}, select the material and then
+ right-click the texture and select \uicontrol {Apply to selected material}.
\endlist
*/
diff --git a/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc b/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc
deleted file mode 100644
index 8efb73ee061..00000000000
--- a/doc/qtdesignstudio/src/views/studio-texture-editor.qdoc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2024 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
- \page studio-texture-editor.html
- \previouspage studio-content-library.html
- \nextpage studio-qt-insight.html
-
- \ingroup studio-views
-
- \title Texture Editor
-
- \brief Create and manage textures.
-
- In the \uicontrol {Texture Editor} view, you create and manage textures.
-
- \image texture-editor.webp "Texture Editor"
-
- \section1 Creating a texture
-
- To create a texture, select \imageplus
- in the \uicontrol {Texture Editor} view.
-
- \note You can also create textures from the
- \l{creating texture material browser}{Material Browser view}.
-
- When you create a texture, it is empty. To add an image to the texture,
- do one of the following:
-
- \list
- \li In the \uicontrol{Texture Editor} view, set the image in the
- \uicontrol Source property.
- \li From the \uicontrol Assets view, drag an image to the
- \uicontrol Source property in the \uicontrol {Texture Editor} view.
- \endlist
-
- \section1 Applying a texture to a material
-
- To apply a texture to a material, first select the material in the
- \uicontrol {Material Browser} view and then:
- \list 1
- \li Select \imageapply
- .
- \li Select the material and property that you want to add the texture to.
- \image select-material-property.png "Select a material property"
- \endlist
-
- \note You can also apply textures to materials in the
- \l {Material Editor and Browser}{Material Browser view}.
-
-*/