From 9552567cd4f8e1baf1a6c14f7a2f86ecfc168cfa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 15 May 2013 12:50:38 +0000 Subject: [PATCH] Added support for osgViewer::Config in osgViewer::Viewer command line parsing --- src/osgViewer/Viewer.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index f1171237d..3b4115508 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -299,6 +300,15 @@ bool Viewer::readConfiguration(const std::string& filename) //OSG_NOTICE<<"Error: Unable to load configuration file \""<(object.get()); + if (config) + { + OSG_NOTICE<<"Using osgViewer::Config : "<className()<configure(*this); + return true; + } + CompositeViewer* compositeViewer = dynamic_cast(object.get()); if (compositeViewer)