From fc07efa65642f4872f1c5f43402c8380302ead12 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 5 Jan 2007 13:16:24 +0000 Subject: [PATCH] Added int return type of Viewer::run(). --- include/osgViewer/Viewer | 2 +- src/osgViewer/Viewer.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/osgViewer/Viewer b/include/osgViewer/Viewer index 556f53caf..895392fed 100644 --- a/include/osgViewer/Viewer +++ b/include/osgViewer/Viewer @@ -66,7 +66,7 @@ class OSGVIEWER_EXPORT Viewer : public osgViewer::View * Also calls realize() if the viewer is not already realized, * and installs trackball manipulator if one is not already assigned. */ - virtual void run(); + virtual int run(); /** Render a complete new frame. * Calls frameAdvance(), frameEventTraversal(), frameUpateTraversal(), frameRenderingTraversals(). */ diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index 4ba9cd793..d530c6f44 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -66,13 +66,13 @@ bool Viewer::isRealized() const return numRealizedWindows > 0; } -void Viewer::run() +int Viewer::run() { // if we don't have any scene graph assigned then just return if (!getSceneData()) { osg::notify(osg::NOTICE)<<"Warning: Viewer::run() called without a scene graph being assigned to the viewer, cannot run."<