mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2990 from akortunov/serialize

Browse Source 
[Regression] Fix crash for ShowSceneGraph
This commit is contained in:
Alexei Dobrohotov 2020-08-12 18:08:33 +03:00 committed by GitHub
commit 5c37b5bc4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwworld/worldimp.cpp
View File

@ -3633,8 +3633,11 @@ namespace MWWorld
std::string World::exportSceneGraph(const Ptr &ptr) std::string World::exportSceneGraph(const Ptr &ptr)
{ {
std::string file = mUserDataPath + "/openmw.osgt"; std::string file = mUserDataPath + "/openmw.osgt";
mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr); if (!ptr.isEmpty())
mWorldScene->removeFromPagedRefs(ptr); {
mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
mWorldScene->removeFromPagedRefs(ptr);
}
mRendering->exportSceneGraph(ptr, file, "Ascii"); mRendering->exportSceneGraph(ptr, file, "Ascii");
return file; return file;
} }

1
components/sceneutil/serialize.cpp
View File

@ -143,6 +143,7 @@ void registerSerializers()
"NifOsg::GeomMorpherController", "NifOsg::GeomMorpherController",
"NifOsg::UpdateMorphGeometry", "NifOsg::UpdateMorphGeometry",
"NifOsg::UVController", "NifOsg::UVController",
"NifOsg::VisController",
"NifOsg::NodeIndexHolder", "NifOsg::NodeIndexHolder",
"osgMyGUI::Drawable", "osgMyGUI::Drawable",
"osg::DrawCallback", "osg::DrawCallback",