From 618e63a2675c6f10e5f9321ec00e3358ef923883 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 14 Jul 2006 14:04:54 +0000 Subject: [PATCH] Removed the default loading of bluemarble.ive --- examples/osglogo/osglogo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/osglogo/osglogo.cpp b/examples/osglogo/osglogo.cpp index 2e4288a8e..5daefd369 100644 --- a/examples/osglogo/osglogo.cpp +++ b/examples/osglogo/osglogo.cpp @@ -211,7 +211,7 @@ osg:: Node* createGlobe(const osg::BoundingBox& bb,float ratio, const std::strin osg::MatrixTransform* xform = new osg::MatrixTransform; xform->setUpdateCallback(new osg::AnimationPathCallback(bb.center(),osg::Vec3(0.0f,0.0f,1.0f),osg::inDegrees(10.0f))); - osg::Node* bluemarble = osgDB::readNodeFile(filename.c_str()); + osg::Node* bluemarble = filename.empty() ? 0 : osgDB::readNodeFile(filename.c_str()); if (bluemarble) { const osg::BoundingSphere& bs = bluemarble->getBound(); @@ -477,7 +477,7 @@ arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationNam osg::Node* node = 0; if (arguments.argc()>1) createLogo(arguments[1]); - else node = createLogo("bluemarble.ive"); + else node = createLogo(""); // add model to viewer. viewer.setSceneData( node );