mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Use custom deleter for btCompoundShape to delete children shapes

Browse Source
This commit is contained in:
elsid 2021-10-30 03:46:29 +02:00
parent b731a981c4
commit a851ac5fea
No known key found for this signature in database
GPG Key ID: B845CB9FEE18AB40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/nifbullet/bulletnifloader.cpp
View File

@ -179,7 +179,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
child.release(); child.release();
mStaticMesh.release(); mStaticMesh.release();
} }
mShape->mCollisionShape.reset(mCompoundShape.release()); mShape->mCollisionShape = std::move(mCompoundShape);
} }
else if (mStaticMesh) else if (mStaticMesh)
{ {

2
components/nifbullet/bulletnifloader.hpp
View File

@ -61,7 +61,7 @@ private:
void handleNiTriShape(const Nif::Node *nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid); void handleNiTriShape(const Nif::Node *nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
std::unique_ptr<btCompoundShape> mCompoundShape; std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
std::unique_ptr<btTriangleMesh> mStaticMesh; std::unique_ptr<btTriangleMesh> mStaticMesh;