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

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-11-23 12:44:01 +01:00
commit 59f8979090
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwrender/characterpreview.cpp
View File

@ -35,7 +35,7 @@ namespace MWRender
, mCamera(NULL) , mCamera(NULL)
, mNode(NULL) , mNode(NULL)
{ {
mCharacter.mCell = NULL;
} }
void CharacterPreview::onSetup() void CharacterPreview::onSetup()
@ -230,7 +230,7 @@ namespace MWRender
, mRef(&mBase) , mRef(&mBase)
{ {
mBase = *mCharacter.get<ESM::NPC>()->mBase; mBase = *mCharacter.get<ESM::NPC>()->mBase;
mCharacter = MWWorld::Ptr(&mRef, mCharacter.getCell()); mCharacter = MWWorld::Ptr(&mRef, NULL);
} }
void RaceSelectionPreview::update(float angle) void RaceSelectionPreview::update(float angle)

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

@ -267,6 +267,7 @@ namespace MWWorld
// Rebuild player // Rebuild player
setupPlayer(); setupPlayer();
mPlayer->setCell(NULL);
MWWorld::Ptr player = mPlayer->getPlayer(); MWWorld::Ptr player = mPlayer->getPlayer();
// removes NpcStats, ContainerStore etc // removes NpcStats, ContainerStore etc