Commit 59020aa6 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed some warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12497 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d1e2a157
......@@ -189,6 +189,8 @@ bool FileOFFPlugin::getCleanLine( std::istream& ifs , std::string& _string, bool
}
return false;
}
//-----------------------------------------------------------------------------------------------------
......@@ -1136,7 +1138,7 @@ int FileOFFPlugin::loadObject(QString _filename) {
if ( triMeshObj ){
if ( !importer.hasVertexNormals() || userReadOptions_ & OFFImporter::FORCE_NONORMALS )
if ( !importer.hasVertexNormals() || (userReadOptions_ & OFFImporter::FORCE_NONORMALS) )
triMeshObj->mesh()->update_normals();
else
triMeshObj->mesh()->update_face_normals();
......
......@@ -56,17 +56,17 @@ bool FileOFFPlugin::writeMesh(std::ostream& _out, MeshT& _mesh ){
******************/
// Write option ST
if(_mesh.has_vertex_texcoords2D() && userWriteOptions_ & OFFImporter::VERTEXTEXCOORDS) {
if(_mesh.has_vertex_texcoords2D() && (userWriteOptions_ & OFFImporter::VERTEXTEXCOORDS) ) {
_out << "ST ";
}
// Write option C
if(_mesh.has_vertex_colors() && userWriteOptions_ & OFFImporter::VERTEXCOLOR) {
if(_mesh.has_vertex_colors() && (userWriteOptions_ & OFFImporter::VERTEXCOLOR) ) {
_out << "C ";
}
// Write option N
if(_mesh.has_vertex_normals() && userWriteOptions_ & OFFImporter::VERTEXNORMAL) {
if(_mesh.has_vertex_normals() && (userWriteOptions_ & OFFImporter::VERTEXNORMAL) ) {
_out << "N ";
}
......@@ -160,7 +160,7 @@ bool FileOFFPlugin::writeASCIIData(std::ostream& _out, MeshT& _mesh ) {
}
// Write face colors
if(_mesh.has_face_colors() && userWriteOptions_ & OFFImporter::FACECOLOR) {
if(_mesh.has_face_colors() && (userWriteOptions_ & OFFImporter::FACECOLOR ) ) {
c = OpenMesh::color_cast<OpenMesh::Vec4f> (_mesh.color(fit.handle()));
_out.precision(6);
_out << " " << std::showpoint << c[0] << " " << std::showpoint << c[1] << " " << std::showpoint << c[2] << " " << std::showpoint << c[3];
......
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