diff --git a/FileOFF.cc b/FileOFF.cc index dd67b877226b8a593778c4dc60646b1a5632cefa..703b5b77de874016566323dc1ef4bb0f81df3877 100644 --- a/FileOFF.cc +++ b/FileOFF.cc @@ -93,7 +93,9 @@ FileOFFPlugin::FileOFFPlugin() userWriteOptions_(0), forceTriangleMesh_(false), forcePolyMesh_(false), - readColorComp_(false) { + readColorComp_(false), + trimeshOptions_(OFFImporter::NONE) +{ } //----------------------------------------------------------------------------------------------------- @@ -534,9 +536,9 @@ bool FileOFFPlugin::readOFFFile(QString _filename, OFFImporter& _importer) { // Create message box QMetaObject::invokeMethod(this,"handleTrimeshDialog",Qt::BlockingQueuedConnection); - if (trimeshOptions == OFFImporter::TRIMESH) + if (trimeshOptions_ == OFFImporter::TRIMESH) type = DATA_TRIANGLE_MESH; - else if (trimeshOptions == OFFImporter::POLYMESH) + else if (trimeshOptions_ == OFFImporter::POLYMESH) type = DATA_POLY_MESH; else type = _importer.isTriangleMesh() ? DATA_TRIANGLE_MESH : DATA_POLY_MESH; @@ -579,9 +581,9 @@ void FileOFFPlugin::handleTrimeshDialog() if (msgBox.clickedButton() == triButton) - trimeshOptions = OFFImporter::TRIMESH ; + trimeshOptions_ = OFFImporter::TRIMESH ; else if (msgBox.clickedButton() == polyButton) - trimeshOptions = OFFImporter::POLYMESH ; + trimeshOptions_ = OFFImporter::POLYMESH ; } //----------------------------------------------------------------------------------------------------- diff --git a/FileOFF.hh b/FileOFF.hh index 9e4e6d3436484320103c40f6592b409075b2cdc9..02923d4cf9015cc7ecb570d5462609ebaa108e68 100644 --- a/FileOFF.hh +++ b/FileOFF.hh @@ -269,7 +269,7 @@ class FileOFFPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte bool forceTriangleMesh_; bool forcePolyMesh_; bool readColorComp_; - OFFImporter::ObjectOptionsE trimeshOptions; + OFFImporter::ObjectOptionsE trimeshOptions_; }; #if defined(INCLUDE_TEMPLATES) && !defined(FILEOFFPLUGIN_C)