FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up pointer usage

Browse Source
This commit is contained in:
Robert Osfield
2016-06-24 10:02:18 +01:00
parent c8d668b298
commit f47be656b4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgUtil/Optimizer.cpp
View File

@@ -809,7 +809,7 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
inline bool isOperationPermissibleForObject(const osg::Drawable* drawable) const
{
// disable if cannot apply transform functor.
if (drawable && !drawable->supports(_transformFunctor)) return false;
if (!drawable->supports(_transformFunctor)) return false;
return BaseOptimizerVisitor::isOperationPermissibleForObject(drawable);
}
@@ -4507,17 +4507,16 @@ void Optimizer::FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor::apply(
if(!_matrixStack.empty() && group.getNumParents() > 1 && nodepathsize > 1)
{
// copy this Group
osg::ref_ptr<osg::Object> new_obj = group.clone(osg::CopyOp::DEEP_COPY_NODES | osg::CopyOp::DEEP_COPY_DRAWABLES | osg::CopyOp::DEEP_COPY_ARRAYS);
osg::Group* new_group = dynamic_cast<osg::Group*>(new_obj.get());
osg::ref_ptr<osg::Group> new_group = osg::clone(&group, osg::CopyOp(osg::CopyOp::DEEP_COPY_NODES | osg::CopyOp::DEEP_COPY_DRAWABLES | osg::CopyOp::DEEP_COPY_ARRAYS));
// New Group should only be added to parent through which this Group
// was traversed, not to all parents of this Group.
osg::Group* parent_group = dynamic_cast<osg::Group*>(_nodePath[nodepathsize-2]);
if(parent_group)
if(new_group && parent_group)
{
parent_group->replaceChild(&group, new_group);
parent_group->replaceChild(&group, new_group.get());
// also replace the node in the nodepath
_nodePath[nodepathsize-1] = new_group;
_nodePath[nodepathsize-1] = new_group.get();
// traverse the new Group
traverse(*(new_group));
}