Commit 58bfcdf0 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Fixed a few warnings.


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17711 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bdc4a8a8
......@@ -100,7 +100,10 @@ BaseNode(BaseNode* _parent, BaseNode* _child, std::string _name)
parent_(_parent),
name_(_name),
status_(Active),
drawMode_(DrawModes::DEFAULT)
drawMode_(DrawModes::DEFAULT),
pickingEnabled_(true),
dirty_ (false),
traverseMode_ (BaseNode::NodeFirst)
{
assert(_parent != 0 && _child != 0);
......
......@@ -557,9 +557,9 @@ bool DrawMode::checkConsistency() const
// points-mode in bitflag => point layer expected
if (*this & DrawModes::POINTS ||
*this & DrawModes::POINTS_COLORED ||
*this & DrawModes::POINTS_SHADED)
if ((*this & DrawModes::POINTS) ||
(*this & DrawModes::POINTS_COLORED) ||
(*this & DrawModes::POINTS_SHADED))
{
int pointsLayer = 0;
for (unsigned int k = 0; k < layers_.size(); ++k)
......
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