aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Vanhatapio <johanna.vanhatapio@qt.io>2021-03-24 11:48:17 +0200
committerJohanna Vanhatapio <johanna.vanhatapio@qt.io>2021-03-29 08:06:34 +0000
commit0da8cbaf8e2bd6573fac3f4af49035213f07898d (patch)
tree36ccd2cf799c2cbc8dbf0f481b05721d1cf22f4e
parent30c5fd6599bcb4e71b7404e7041512911ceecfd4 (diff)
Doc: Update info about applying 3D materials
Fixes: QDS-4032 Change-Id: Idbaea9f0d47ef4be894f68e884722c8dcab734d1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc20
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc10
2 files changed, 19 insertions, 11 deletions
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 dc3cf6247b..75cb1e1275 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -220,15 +220,13 @@
\section1 Applying Materials to Models
- To apply materials to \l {Adding 3D Models}{models}:
-
- \list 1
- \li Drag and drop a material component from \l Library to a model
- component in \l Navigator.
- \li Select the Model component.
- \li In the \uicontrol Properties view, select the material for the model
- in the \uicontrol Materials list.
- \li Select the material component to edit the properties of the material
- in the \uicontrol Properties view.
- \endlist
+ To apply materials to models, you should first delete the default material,
+ and then drag-and-drop a new material from \l Library to a model component
+ in \l Navigator.
+
+ You can apply the same material to another component as well. Again,
+ delete the default material first. You should then select the component and
+ go to the \uicontrol Properties view. Find the \uicontrol Materials property,
+ select the \inlineimage plus.png
+ icon, and choose the new material in the dropdown menu.
*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
index c0dcf127a3..f84c5e9e39 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
@@ -35,6 +35,16 @@
\QDS provides a set of pregenerated Qt Quick 3D materials that can be used
to create good-looking \l {Adding 3D Models}{models} quickly and easily.
+ To apply 3D materials to models, you should first delete the default material,
+ and then drag-and-drop a new material from \l Library to a model component
+ in \l Navigator.
+
+ You can apply the same material to another component as well. Again,
+ delete the default material first. You should then select the component and
+ go to the \uicontrol Properties view. Find the \uicontrol Materials property,
+ select the \inlineimage plus.png
+ icon, and choose the new material in the dropdown menu.
+
To apply a 3D material to a component, drag-and-drop a material from
\l Library > \uicontrol Components > \uicontrol QtQuick3D >
\uicontrol {Qt Quick 3D Materials} to a model component in \l Navigator.