Commit 78c8871d authored by Martin Schultz's avatar Martin Schultz
Browse files

adopted CoreProfile to ACG SceneGraph

parent a5b5c5fa
......@@ -114,9 +114,13 @@ bool PickAction::operator()(BaseNode* _node)
if ( !_node->pickingEnabled() )
return true;
ACG::GLState::disable(GL_LIGHTING);
ACG::GLState::disable(GL_DITHER);
if (state_.compatibilityProfile())
{
ACG::GLState::disable(GL_LIGHTING);
ACG::GLState::shadeModel(GL_FLAT);
}
state_.pick_push_name ((GLuint) _node->id());
......
......@@ -372,7 +372,7 @@ public:
BoundingBoxAction() :
bbMin_( FLT_MAX, FLT_MAX, FLT_MAX),
bbMax_(-FLT_MAX, -FLT_MAX, -FLT_MAX),
state_(false)
state_(false, false)
{ }
bool operator()(BaseNode* _node)
......
Markdown is supported
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