Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marc Zinnschlag 2016-04-05 09:06:04 +02:00
commit f2b2a760b3

View file

@ -1540,6 +1540,8 @@ namespace MWMechanics
{
mActors.clear();
mStolenItems.clear();
mClassSelected = false;
mRaceSelected = false;
}
bool MechanicsManager::isAggressive(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)