diff --git a/include/ACGL/Utils/Log.hh b/include/ACGL/Utils/Log.hh index 1e8f9d5117f2b68dde88ceddbeee9a14b15a12fc..f48466436b814a31babaa27619e18e3eaa4f9244 100644 --- a/include/ACGL/Utils/Log.hh +++ b/include/ACGL/Utils/Log.hh @@ -178,14 +178,6 @@ inline CoutLikeStream<3>& error() { return (*CoutLikeStream<3>::the()); } template < unsigned int N > inline CoutLikeStream<N>& log() { return (*CoutLikeStream<N>::the()); } -// alternative syntax -#define ACGL_DEBUG(STREAM) ACGL::Utils::debug() << STREAM; -#define ACGL_MESSAGE(STREAM) ACGL::Utils::message() << STREAM; -#define ACGL_WARNING(STREAM) ACGL::Utils::warning() << STREAM; -#define ACGL_ERROR(STREAM) ACGL::Utils::error() << STREAM; - -#define ACGL_LOG(N,STREAM) ACGL::Utils::log<N>() << STREAM; - } // Utils } // ACGL diff --git a/src/ACGL/OpenGL/Data/GeometryDataLoadStoreOBJ.cc b/src/ACGL/OpenGL/Data/GeometryDataLoadStoreOBJ.cc index edb28ff9decf6f4b65186a41a79847979fd834e1..fb530b4114e076a60b41e026017635d829725015 100644 --- a/src/ACGL/OpenGL/Data/GeometryDataLoadStoreOBJ.cc +++ b/src/ACGL/OpenGL/Data/GeometryDataLoadStoreOBJ.cc @@ -276,8 +276,7 @@ SharedGeometryData loadGeometryDataFromOBJ(const std::string& _filename, bool _c debug() << "model has no normals, computing face normals" << std::endl; hasNormals = true; } - } - if (hasNormals) { + } else if (hasNormals) { // if the model has normals defined, no face normals have to get computed _computeNormals = false; }