Showing the changes to interface/src/avatar/AvatarProject.cpp (1 of 18 files). Show all
Unified · Split
| @@ -81,18 +81,18 @@ AvatarProject* AvatarProject::createAvatarProject(const QString& projectsFolder, · 80 unmodified lines | |||
| 81 | } | 81 | } |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | foreach(const HFMMaterial mat, hfmModel->materials) { | 84 | foreach(const HFMMaterial material, hfmModel->materials) { |
| 85 | addTextureToList(mat.normalTexture); | 85 | addTextureToList(material.normalTexture); |
| 86 | addTextureToList(mat.albedoTexture); | 86 | addTextureToList(material.albedoTexture); |
| 87 | addTextureToList(mat.opacityTexture); | 87 | addTextureToList(material.opacityTexture); |
| 88 | addTextureToList(mat.glossTexture); | 88 | addTextureToList(material.glossTexture); |
| 89 | addTextureToList(mat.roughnessTexture); | 89 | addTextureToList(material.roughnessTexture); |
| 90 | addTextureToList(mat.specularTexture); | 90 | addTextureToList(material.specularTexture); |
| 91 | addTextureToList(mat.metallicTexture); | 91 | addTextureToList(material.metallicTexture); |
| 92 | addTextureToList(mat.emissiveTexture); | 92 | addTextureToList(material.emissiveTexture); |
| 93 | addTextureToList(mat.occlusionTexture); | 93 | addTextureToList(material.occlusionTexture); |
| 94 | addTextureToList(mat.scatteringTexture); | 94 | addTextureToList(material.scatteringTexture); |
| 95 | addTextureToList(mat.lightmapTexture); | 95 | addTextureToList(material.lightmapTexture); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | QDir textureDir(textureFolder.isEmpty() ? fbxInfo.absoluteDir() : textureFolder); | 98 | QDir textureDir(textureFolder.isEmpty() ? fbxInfo.absoluteDir() : textureFolder); |
| @@ -152,7 +152,6 @@ AvatarProject::AvatarProject(FST* fst) { · 53 unmodified lines | |||
| 152 | _fst->setScriptPaths(getScriptPaths(QDir(_directory.path() + "/scripts"))); | 152 | _fst->setScriptPaths(getScriptPaths(QDir(_directory.path() + "/scripts"))); |
| 153 | _fst->write(); | 153 | _fst->write(); |
| 154 | 154 | ||
| 155 | //_projectFiles = _directory.entryList(); | ||
| 156 | refreshProjectFiles(); | 155 | refreshProjectFiles(); |
| 157 | 156 | ||
| 158 | _projectPath = fileInfo.absoluteDir().absolutePath(); | 157 | _projectPath = fileInfo.absoluteDir().absolutePath(); |