mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-20 10:20:50 +00:00
Merge remote-tracking branch 'scrawl/master'
This commit is contained in:
commit
59f8979090
@ -35,7 +35,7 @@ namespace MWRender
|
||||
, mCamera(NULL)
|
||||
, mNode(NULL)
|
||||
{
|
||||
|
||||
mCharacter.mCell = NULL;
|
||||
}
|
||||
|
||||
void CharacterPreview::onSetup()
|
||||
@ -230,7 +230,7 @@ namespace MWRender
|
||||
, mRef(&mBase)
|
||||
{
|
||||
mBase = *mCharacter.get<ESM::NPC>()->mBase;
|
||||
mCharacter = MWWorld::Ptr(&mRef, mCharacter.getCell());
|
||||
mCharacter = MWWorld::Ptr(&mRef, NULL);
|
||||
}
|
||||
|
||||
void RaceSelectionPreview::update(float angle)
|
||||
|
@ -267,6 +267,7 @@ namespace MWWorld
|
||||
|
||||
// Rebuild player
|
||||
setupPlayer();
|
||||
mPlayer->setCell(NULL);
|
||||
MWWorld::Ptr player = mPlayer->getPlayer();
|
||||
|
||||
// removes NpcStats, ContainerStore etc
|
||||
|
Loading…
x
Reference in New Issue
Block a user