diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-11-12 14:19:22 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-11-13 07:21:22 +0000 |
| commit | 162512c2ea1bc4ce13c530a89f63a31f7a71b0a0 (patch) | |
| tree | 350a03c968fbe30bd997bc43d983a16b8cfcc217 /src/Authoring/Studio/Palettes/Project | |
| parent | ada8b5432f74dc8974d08964ff8d368d94da0022 (diff) | |
Import non-default custom material assets
Task-number: QT3DS-2599
Change-Id: Ia2525ab016cad51892515182b1e9e43834dfc204
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Project')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp index 43c02b0f..ba9a00f6 100644 --- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp +++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp @@ -792,8 +792,12 @@ void ProjectFileSystemModel::importUrl(QDir &targetDir, const QUrl &url, QString absSrcPath = fileInfo.absoluteFilePath(); QString projectPath = QFileInfo(PresentationFile::findProjectFile(absSrcPath)).absolutePath(); + // Since we are importing a bare material/effect, we don't care about possible dynamic + // values of texture properties + QSet<QString> dummyPropertySet; g_StudioApp.GetCore()->GetDoc()->GetDocumentReader() - .ParseSourcePathsOutOfEffectFile(absSrcPath, effectFileSourcePaths, projectPath); + .ParseSourcePathsOutOfEffectFile(absSrcPath, projectPath, effectFileSourcePaths, + dummyPropertySet); QHashIterator<QString, QString> pathIter(effectFileSourcePaths); while (pathIter.hasNext()) { |