Skip to content
Permalink
Browse files

fix nightly build (followup a57066a)

  • Loading branch information
jef-n committed Nov 21, 2014
1 parent 336fe99 commit 6c836f0e9d5b96d4ec46781fed98cc7aaa848345
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/plugins/globe/osgEarthUtil/Controls.cpp
@@ -1799,19 +1799,18 @@ ControlNodeBin::draw( const ControlContext& context, bool newContext, int bin )

if ( _sortingEnabled && _sortByDistance )
{
for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); )
for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); ++i )
{
ControlNode* node = i->second.get();
if ( node->getNumParents() == 0 )
{
_renderNodes.erase( node );
i = _controlNodes.erase( i );
_controlNodes.erase( i );
}
else
{
ControlNode::PerViewData& nodeData = node->getData( context._view );
byDepth.insert( ControlNodePair(nodeData._screenPos.z(), node) );
++i;
}
}

0 comments on commit 6c836f0

Please sign in to comment.
You can’t perform that action at this time.