diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-09-19 09:54:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-19 09:54:06 +0200 |
| commit | 5d55cfdae5e37c9d39b23a261b2569c91db6d5d5 (patch) | |
| tree | a6b2f1468f673519ce0e075728c05071efde4746 /doc/qtdesignstudio | |
| parent | 2429232e721a832662756bb0840bec3b51d3d769 (diff) | |
| parent | a7c0bffc5c7d2b9e78632e236ae9db331e3690e3 (diff) | |
| download | qt-creator-5d55cfdae5e37c9d39b23a261b2569c91db6d5d5.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
src/libs/utils/fileutils.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/designercore/include/abstractview.h
src/plugins/qmldesigner/designercore/include/nodemetainfo.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/qmldesigner/designercore/model/model_p.h
src/plugins/remotelinux/linuxdevice.cpp
tests/auto/utils/fileutils/tst_fileutils.cpp
Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
Diffstat (limited to 'doc/qtdesignstudio')
| -rw-r--r-- | doc/qtdesignstudio/images/material-copy-properties.png | bin | 0 -> 34372 bytes | |||
| -rw-r--r-- | doc/qtdesignstudio/images/material-editor-browser.webp | bin | 49886 -> 48502 bytes | |||
| -rw-r--r-- | doc/qtdesignstudio/src/views/studio-material-editor.qdoc | 28 |
3 files changed, 26 insertions, 2 deletions
diff --git a/doc/qtdesignstudio/images/material-copy-properties.png b/doc/qtdesignstudio/images/material-copy-properties.png Binary files differnew file mode 100644 index 0000000000..aae3020929 --- /dev/null +++ b/doc/qtdesignstudio/images/material-copy-properties.png diff --git a/doc/qtdesignstudio/images/material-editor-browser.webp b/doc/qtdesignstudio/images/material-editor-browser.webp Binary files differindex d3963b522e..8933b9d8e6 100644 --- a/doc/qtdesignstudio/images/material-editor-browser.webp +++ b/doc/qtdesignstudio/images/material-editor-browser.webp diff --git a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc index a7855aaceb..4120bb633e 100644 --- a/doc/qtdesignstudio/src/views/studio-material-editor.qdoc +++ b/doc/qtdesignstudio/src/views/studio-material-editor.qdoc @@ -39,8 +39,12 @@ \section1 Assigning a Material to an Object - To assign a material to a 3D object in your project, first select the object - in \uicontrol Navigator or the \uicontrol{3D} view. Then, do one of the + 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: \list @@ -64,6 +68,26 @@ \image materials-remove-material.png \endlist + \section1 Copying and Pasting Material Properties + + You can copy properties from one material to another. You can choose if you + want to copy all properties or certain property groups. + + To copy material properties from one material to another: + + \list + \li In \uicontrol {Material Browser}, right-click the material that you + want to copy properties from. + \li Select \uicontrol {Copy properties} and then + \uicontrol All or a property group. + \image material-copy-properties.png + \li Right-click the material that you want to copy the properties to. + \li Select \uicontrol {Paste properties}. + \endlist + + \note You can't copy material properties between materials of different + material types. + \section1 Using Texture Maps In \QDS you can add many different texture maps to your material. |
