diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-30 11:56:58 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-30 11:35:25 +0000 |
| commit | 40a191059699f37d947d6822b0df69f30803b167 (patch) | |
| tree | 626979f17e9e6ab2396305a5ded06b7d0e302ed1 /src/Runtime/testres.qrc | |
| parent | 74ae2a3054f8902f8f45f7cc08854e802085a8a5 (diff) | |
Allow .shader suffix for .material files
Also renames *.material files to *.shader files inside the Material
Library.
Task-number: QT3DS-2787
Change-Id: Iaa3e64fae934b526ad0903c19d3cdb2b6923cc95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/testres.qrc')
| -rw-r--r-- | src/Runtime/testres.qrc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Runtime/testres.qrc b/src/Runtime/testres.qrc index d099c345..7b3c20bc 100644 --- a/src/Runtime/testres.qrc +++ b/src/Runtime/testres.qrc @@ -1,11 +1,11 @@ <RCC> <qresource prefix="/"> - <file alias="aluminium.material">../../Studio/Content/Material Library/aluminum.material</file> - <file alias="asphalt.material">../../Studio/Content/Material Library/asphalt.material</file> - <file alias="concrete.material">../../Studio/Content/Material Library/concrete.material</file> - <file alias="copper.material">../../Studio/Content/Material Library/copper.material</file> - <file alias="porcelain.material">../../Studio/Content/Material Library/porcelain.material</file> - <file alias="simple_glass.material">../../Studio/Content/Material Library/simple_glass.material</file> + <file alias="aluminium.shader">../../Studio/Content/Material Library/aluminum.shader</file> + <file alias="asphalt.shader">../../Studio/Content/Material Library/asphalt.shader</file> + <file alias="concrete.shader">../../Studio/Content/Material Library/concrete.shader</file> + <file alias="copper.shader">../../Studio/Content/Material Library/copper.shader</file> + <file alias="porcelain.shader">../../Studio/Content/Material Library/porcelain.shader</file> + <file alias="simple_glass.shader">../../Studio/Content/Material Library/simple_glass.shader</file> <file alias="Desaturate.effect">../../Studio/Content/Effect Library/Desaturate.effect</file> <file alias="Gaussian Blur.effect">../../Studio/Content/Effect Library/Gaussian Blur.effect</file> <file alias="Sepia.effect">../../Studio/Content/Effect Library/Sepia.effect</file> |