From f17faa80b396aec877ffa8d845bcd8bfaad60c8c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 17 Mar 2006 22:22:57 +0000 Subject: [PATCH] From Keith Steffen, changed instance of sun to sun_geode to avoid Solaris10 build issue with it defining "sun"?#! --- examples/osgdepthpartition/osgdepthpartition.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/osgdepthpartition/osgdepthpartition.cpp b/examples/osgdepthpartition/osgdepthpartition.cpp index 173ffdf1e..f8cf72013 100644 --- a/examples/osgdepthpartition/osgdepthpartition.cpp +++ b/examples/osgdepthpartition/osgdepthpartition.cpp @@ -41,9 +41,9 @@ osg::Node* createScene() sun_sd->setShape(sun_sphere); sun_sd->setColor(osg::Vec4(1.0, 0.0, 0.0, 1.0)); - osg::Geode* sun = new osg::Geode; - sun->setName("sun"); - sun->addDrawable(sun_sd); + osg::Geode* sun_geode = new osg::Geode; + sun_geode->setName("sun"); + sun_geode->addDrawable(sun_sd); // Move the sun behind the earth osg::PositionAttitudeTransform *pat = new osg::PositionAttitudeTransform; @@ -52,7 +52,7 @@ osg::Node* createScene() osg::Group* scene = new osg::Group; scene->addChild(earth); scene->addChild(pat); - pat->addChild(sun); + pat->addChild(sun_geode); return scene; }