Merge branch 'master' of github.com:gwaldron/osgearth

neshume · Jul 1, 2021 · 9909159 · 9909159
2 parents 8e476cb + 078e212
commit 9909159
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/osgEarth/FeatureCursor.cpp b/src/osgEarth/FeatureCursor.cpp
@@ -53,7 +53,7 @@ FeatureCursor::fill(
  while (hasMore())
  {
  osg::ref_ptr<Feature> f = nextFeature();
- if (predicate(f))
+ if (predicate(f.get()))
  list.push_back(f);
  }
 }

diff --git a/src/osgEarth/PowerlineLayer.cpp b/src/osgEarth/PowerlineLayer.cpp
@@ -1058,9 +1058,9 @@ bool PowerlineFeatureNodeFactory::createOrUpdateNode(FeatureCursor* cursor, cons
  for (FeatureList::iterator i = cableFeatures.begin(); i != cableFeatures.end(); ++i)
  {
  Style localStyle;
- evalStyle(*i, localCX, _cableExpr.get(), localStyle);
+ evalStyle(i->get(), localCX, _cableExpr.get(), localStyle);
  setCableStyleDefaults(localStyle);
- osg::Node* cable = compiler.compile(*i, localStyle, localCX);
+ osg::Node* cable = compiler.compile(i->get(), localStyle, localCX);
  results->addChild(cable);
  }
  }

diff --git a/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp b/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp
@@ -724,7 +724,7 @@ RexTerrainEngineNode::cull_traverse(osg::NodeVisitor& nv)
 
  if (layerDrawable->_layer)
  {
- layerDrawable->_layer->apply(layerDrawable, cv);
+ layerDrawable->_layer->apply(layerDrawable.get(), cv);
  }
  else
  {