Changed DisplaySetting::instance() to return a ref_ptr<>& rathern than a raw C pointer to enable apps to delete the singleton or assign their own.

This commit is contained in:
Robert Osfield
2010-04-30 11:48:30 +00:00
parent afce262601
commit c2a59415ce
5 changed files with 51 additions and 11 deletions

View File

@@ -23,10 +23,10 @@
using namespace osg;
using namespace std;
DisplaySettings* DisplaySettings::instance()
ref_ptr<DisplaySettings>& DisplaySettings::instance()
{
static ref_ptr<DisplaySettings> s_displaySettings = new DisplaySettings;
return s_displaySettings.get();
return s_displaySettings;
}
DisplaySettings::DisplaySettings(const DisplaySettings& vs):Referenced(true)