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/Authoring/Studio/Palettes/Inspector | |
| 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/Authoring/Studio/Palettes/Inspector')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index f9dedc12..4016fb33 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -95,6 +95,7 @@ void InspectorControlView::filterMaterials(std::vector<Q3DStudio::CFilePath> &ma { static const wchar_t *extensions[] = { L"material", + L"shader", nullptr }; for (size_t i = 0; i < m_fileList.size(); ++i) { @@ -139,7 +140,7 @@ void InspectorControlView::onFilesChanged( const Q3DStudio::TFileModificationList &inFileModificationList) { static const wchar_t *materialExtensions[] = { - L"material", L"materialdef", + L"material", L"shader", L"materialdef", nullptr }; static const wchar_t *fontExtensions[] = { |