Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2646 from Atlante45/master

Browse source 
Fixed dometime using wrong texdir
This commit is contained in:
Stephen Birarda 2014-04-10 14:43:36 -07:00
commit 11f5ee202a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ModelUploader.cpp
View file

@ -307,13 +307,13 @@ bool ModelUploader::addTextures(const QString& texdir, const QString fbxFile) {
foreach (FBXMesh mesh, geometry.meshes) {
foreach (FBXMeshPart part, mesh.parts) {
if (!part.diffuseFilename.isEmpty()) {
if (!addPart(QFileInfo(fbxFile).path() + "/" + part.diffuseFilename,
if (!addPart(texdir + "/" + part.diffuseFilename,
QString("texture%1").arg(++_texturesCount))) {
return false;
}
}
if (!part.normalFilename.isEmpty()) {
if (!addPart(QFileInfo(fbxFile).path() + "/" + part.normalFilename,
if (!addPart(texdir + "/" + part.normalFilename,
QString("texture%1").arg(++_texturesCount))) {
return false;
}