fixed texture not exported with single image scan

matlabbe · matlabbe · commit 53ff5b56e636 · 2017-02-01T12:53:05.000-05:00
diff --git a/guilib/src/ExportCloudsDialog.cpp b/guilib/src/ExportCloudsDialog.cpp
@@ -2490,8 +2490,7 @@ void ExportCloudsDialog::saveTextureMeshes(
 						QString fullPath;
 						if(singleTexture)
 						{
-							mesh->tex_materials[i].tex_file = QFileInfo(path).baseName().toStdString();
-							fullPath = QFileInfo(path).absoluteDir().absolutePath()+QDir::separator()+QString(mesh->tex_materials[i].tex_file.c_str())+_ui->comboBox_meshingTextureFormat->currentText();
+							fullPath = QFileInfo(path).absoluteDir().absolutePath()+QDir::separator()+QFileInfo(path).baseName()+_ui->comboBox_meshingTextureFormat->currentText();
 						}
 						else
 						{
@@ -2547,7 +2546,7 @@ void ExportCloudsDialog::saveTextureMeshes(
 						// relative path
 						if(singleTexture)
 						{
-							mesh->tex_materials[i].tex_file=(QString(mesh->tex_materials[i].tex_file.c_str())+_ui->comboBox_meshingTextureFormat->currentText()).toStdString();
+							mesh->tex_materials[i].tex_file=QFileInfo(path).baseName().toStdString()+_ui->comboBox_meshingTextureFormat->currentText().toStdString();
 						}
 						else
 						{

Original file line number	Diff line number	Diff line change
`@@ -2490,8 +2490,7 @@ void ExportCloudsDialog::saveTextureMeshes(`
`2490`	`2490`	`QString fullPath;`
`2491`	`2491`	`if(singleTexture)`
`2492`	`2492`	`{`
`2493`		`- mesh->tex_materials[i].tex_file = QFileInfo(path).baseName().toStdString();`
`2494`		`- fullPath = QFileInfo(path).absoluteDir().absolutePath()+QDir::separator()+QString(mesh->tex_materials[i].tex_file.c_str())+_ui->comboBox_meshingTextureFormat->currentText();`
	`2493`	`+ fullPath = QFileInfo(path).absoluteDir().absolutePath()+QDir::separator()+QFileInfo(path).baseName()+_ui->comboBox_meshingTextureFormat->currentText();`
`2495`	`2494`	`}`
`2496`	`2495`	`else`
`2497`	`2496`	`{`
`@@ -2547,7 +2546,7 @@ void ExportCloudsDialog::saveTextureMeshes(`
`2547`	`2546`	`// relative path`
`2548`	`2547`	`if(singleTexture)`
`2549`	`2548`	`{`
`2550`		`- mesh->tex_materials[i].tex_file=(QString(mesh->tex_materials[i].tex_file.c_str())+_ui->comboBox_meshingTextureFormat->currentText()).toStdString();`
	`2549`	`+ mesh->tex_materials[i].tex_file=QFileInfo(path).baseName().toStdString()+_ui->comboBox_meshingTextureFormat->currentText().toStdString();`
`2551`	`2550`	`}`
`2552`	`2551`	`else`
`2553`	`2552`	`{`