From 43384596d4835ac310a7d02295b228cc1d1477ab Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 18 Jun 2015 01:26:10 +0200 Subject: [PATCH] Style fix --- components/resource/scenemanager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index 6f38c41c4..efaccec13 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -104,8 +104,7 @@ namespace Resource // TODO: add support for non-NIF formats - NifOsg::Loader loader; - osg::ref_ptr loaded = loader.load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), mTextureManager); + osg::ref_ptr loaded = NifOsg::Loader::load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), mTextureManager); osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get()); // TODO: run SharedStateManager::prune on unload @@ -144,9 +143,8 @@ namespace Resource { Files::IStreamPtr file = mVFS->get(normalized); - NifOsg::Loader loader; osg::ref_ptr loaded (new NifOsg::KeyframeHolder); - loader.loadKf(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), *loaded.get()); + NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), *loaded.get()); mKeyframeIndex[normalized] = loaded; return loaded;