mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-01 16:13:28 +00:00
Merge branch 'msvc_crash_fix' into 'master'
Avoid MSVC crash in Visual Studio 17.10.0 See merge request OpenMW/openmw!4116
This commit is contained in:
commit
b0aa19dc07
@ -75,8 +75,8 @@ namespace CSMWorld
|
|||||||
/// Marks an additional dependency
|
/// Marks an additional dependency
|
||||||
void addOtherDependency(const ESM::RefId& id);
|
void addOtherDependency(const ESM::RefId& id);
|
||||||
/// Clears parts and dependencies
|
/// Clears parts and dependencies
|
||||||
void reset_data(const ESM::RefId& raceId,
|
void reset_data(const ESM::RefId& raceId, const WeightsHeights& raceStats = { { 1.f, 1.f }, { 1.f, 1.f } },
|
||||||
const WeightsHeights& raceStats = { osg::Vec2f(1.f, 1.f), osg::Vec2f(1.f, 1.f) }, bool isBeast = false);
|
bool isBeast = false);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool handles(ESM::PartReferenceType type) const;
|
bool handles(ESM::PartReferenceType type) const;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user