From f5f20e4ac1f255f1d02a1542ec68f4f868d06d4c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Oct 2002 07:46:11 +0000 Subject: [PATCH] Fix from Don Tidrow for bug when moving between RenderGraph when popping back up to common parents. --- include/osgUtil/RenderGraph | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/osgUtil/RenderGraph b/include/osgUtil/RenderGraph index 16b0a3e90..651302e99 100644 --- a/include/osgUtil/RenderGraph +++ b/include/osgUtil/RenderGraph @@ -225,7 +225,11 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced } // now pop back up both parent paths until they agree. - while (sg_curr->_parent!=sg_new->_parent) + + // DRT - 10/22/02 + // should be this to conform with above case where two RenderGraph + // nodes have the same parent + while (sg_curr != sg_new) { if (sg_curr->_stateset.valid()) state.popStateSet(); sg_curr = sg_curr->_parent;