From 7f342374fccc4d77e545588694d61708f3b8e6ff Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Wed, 12 Aug 2020 11:16:10 +0400 Subject: [PATCH 1/2] Fix crash when using 'showscenegraph 1' console command --- apps/openmw/mwworld/worldimp.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 2eec9bf0e2..54dbfa7b69 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -3633,8 +3633,11 @@ namespace MWWorld std::string World::exportSceneGraph(const Ptr &ptr) { std::string file = mUserDataPath + "/openmw.osgt"; - mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); - mWorldScene->removeFromPagedRefs(ptr); + if (!ptr.isEmpty()) + { + mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); + mWorldScene->removeFromPagedRefs(ptr); + } mRendering->exportSceneGraph(ptr, file, "Ascii"); return file; } From 215ddb910641f921dc3b8463d1590de4eafcd9d9 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Wed, 12 Aug 2020 11:16:37 +0400 Subject: [PATCH 2/2] Do not print warnings for VisController --- components/sceneutil/serialize.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp index 62325186c0..9e7aa83f69 100644 --- a/components/sceneutil/serialize.cpp +++ b/components/sceneutil/serialize.cpp @@ -143,6 +143,7 @@ void registerSerializers() "NifOsg::GeomMorpherController", "NifOsg::UpdateMorphGeometry", "NifOsg::UVController", + "NifOsg::VisController", "NifOsg::NodeIndexHolder", "osgMyGUI::Drawable", "osg::DrawCallback",