Commit 513390af authored by Sylvain Thery's avatar Sylvain Thery
Browse files

pb merge

parent 5fcc481c
...@@ -248,15 +248,11 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode) ...@@ -248,15 +248,11 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
Algo::Export::exportOFF<PFP>(myMap, position, filename.c_str(), allDarts) ; Algo::Export::exportOFF<PFP>(myMap, position, filename.c_str(), allDarts) ;
else if (extension.compare(0, 4, std::string(".ply")) == 0) else if (extension.compare(0, 4, std::string(".ply")) == 0)
{ {
<<<<<<< HEAD
int ascii = 0 ; int ascii = 0 ;
if (askExportMode) if (askExportMode)
Utils::QT::inputValues(Utils::QT::VarCombo("binary mode;ascii mode",ascii,"Save in")) ; Utils::QT::inputValues(Utils::QT::VarCombo("binary mode;ascii mode",ascii,"Save in")) ;
std::vector<PFP::TVEC3*> attributes ;
=======
std::vector<AttributeHandler<VEC3, VERTEX>*> attributes ; std::vector<AttributeHandler<VEC3, VERTEX>*> attributes ;
>>>>>>> 90de9842150111c7084b862de51487ced5133651
attributes.push_back(&position) ; attributes.push_back(&position) ;
Algo::Export::exportPLYnew<PFP>(myMap, attributes, filename.c_str(), !ascii, allDarts) ; Algo::Export::exportPLYnew<PFP>(myMap, attributes, filename.c_str(), !ascii, allDarts) ;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment