mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-08 17:16:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'youhavemyoarcitizen' into 'master'

Browse source 
Fix bhkConvexSweepShape loading

See merge request OpenMW/openmw!3444
This commit is contained in:
psi29a 2023-09-24 17:11:58 +00:00
commit 8df8135f1d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/physics.hpp
View file

@ -553,7 +553,7 @@ namespace Nif
struct bhkConvexSweepShape : bhkShape struct bhkConvexSweepShape : bhkShape
{ {
bhkConvexShape mShape; bhkConvexShapePtr mShape;
HavokMaterial mMaterial; HavokMaterial mMaterial;
float mRadius; float mRadius;

2
components/nif/recordptr.hpp
View file

@ -147,6 +147,7 @@ namespace Nif
struct bhkShape; struct bhkShape;
struct bhkSerializable; struct bhkSerializable;
struct bhkEntity; struct bhkEntity;
struct bhkConvexShape;
struct hkPackedNiTriStripsData; struct hkPackedNiTriStripsData;
struct NiAccumulator; struct NiAccumulator;
struct NiInterpolator; struct NiInterpolator;
@ -192,6 +193,7 @@ namespace Nif
using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>; using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
using bhkShapePtr = RecordPtrT<bhkShape>; using bhkShapePtr = RecordPtrT<bhkShape>;
using bhkEntityPtr = RecordPtrT<bhkEntity>; using bhkEntityPtr = RecordPtrT<bhkEntity>;
using bhkConvexShapePtr = RecordPtrT<bhkConvexShape>;
using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>; using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
using NiAccumulatorPtr = RecordPtrT<NiAccumulator>; using NiAccumulatorPtr = RecordPtrT<NiAccumulator>;
using NiInterpolatorPtr = RecordPtrT<NiInterpolator>; using NiInterpolatorPtr = RecordPtrT<NiInterpolator>;