History

- rename functionality - avatar packager works in tablet now

Thijs Wenker committed 7 years ago

Commit cb33a911 parent 1ec8aa818 files · +542 −371Browse files

Showing the changes to interface/src/avatar/AvatarProject.cpp (1 of 18 files). Show all

Unified · Split

interface/src/avatar/AvatarProject.cpp+12−13
@@ -81,18 +81,18 @@ AvatarProject* AvatarProject::createAvatarProject(const QString& projectsFolder, · 80 unmodified lines
8181 }
8282 };
8383
84− foreach(const HFMMaterial mat, hfmModel->materials) {
85− addTextureToList(mat.normalTexture);
86− addTextureToList(mat.albedoTexture);
87− addTextureToList(mat.opacityTexture);
88− addTextureToList(mat.glossTexture);
89− addTextureToList(mat.roughnessTexture);
90− addTextureToList(mat.specularTexture);
91− addTextureToList(mat.metallicTexture);
92− addTextureToList(mat.emissiveTexture);
93− addTextureToList(mat.occlusionTexture);
94− addTextureToList(mat.scatteringTexture);
95− addTextureToList(mat.lightmapTexture);
84+ foreach(const HFMMaterial material, hfmModel->materials) {
85+ addTextureToList(material.normalTexture);
86+ addTextureToList(material.albedoTexture);
87+ addTextureToList(material.opacityTexture);
88+ addTextureToList(material.glossTexture);
89+ addTextureToList(material.roughnessTexture);
90+ addTextureToList(material.specularTexture);
91+ addTextureToList(material.metallicTexture);
92+ addTextureToList(material.emissiveTexture);
93+ addTextureToList(material.occlusionTexture);
94+ addTextureToList(material.scatteringTexture);
95+ addTextureToList(material.lightmapTexture);
9696 }
9797
9898 QDir textureDir(textureFolder.isEmpty() ? fbxInfo.absoluteDir() : textureFolder);
@@ -152,7 +152,6 @@ AvatarProject::AvatarProject(FST* fst) { · 53 unmodified lines
152152 _fst->setScriptPaths(getScriptPaths(QDir(_directory.path() + "/scripts")));
153153 _fst->write();
154154
155− //_projectFiles = _directory.entryList();
156155 refreshProjectFiles();
157156
158157 _projectPath = fileInfo.absoluteDir().absolutePath();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t