From 2c25825800b9cfec3815026dbe95d2a8944502cb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 27 Jun 2014 15:38:48 +0000 Subject: [PATCH] Added a render order sort to the list of Cameras being tested by the *Viewer::generatePointerData(..) method to ensure that the highest Camera gets focus. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14311 16af8721-9629-0410-8352-f15c8da7e697 --- src/osg/ApplicationUsage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osg/ApplicationUsage.cpp b/src/osg/ApplicationUsage.cpp index 51f177772..ad2404089 100644 --- a/src/osg/ApplicationUsage.cpp +++ b/src/osg/ApplicationUsage.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -33,6 +34,8 @@ ApplicationUsage* ApplicationUsage::instance() return s_applicationUsage.get(); } +OSG_INIT_SINGLETON_PROXY(ApplicationUsageSingletonProxy, ApplicationUsage::instance()) + void ApplicationUsage::addUsageExplanation(Type type,const std::string& option,const std::string& explanation) { switch(type) @@ -69,7 +72,7 @@ void ApplicationUsage::addKeyboardMouseBinding(const std::string& prefix, int ke { std::ostringstream ostr; ostr<