mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fixemptycollisioncrash' into 'master'

Browse Source 
Make empty collision shape for objects without any triangles.

Closes #7077

See merge request OpenMW/openmw!2871
This commit is contained in:
psi29a 2023-03-30 21:47:35 +00:00
commit 119163e74b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -41,6 +41,7 @@
Bug #7044: Changing a class' services does not affect autocalculated NPCs Bug #7044: Changing a class' services does not affect autocalculated NPCs
Bug #7054: Quests aren't sorted by name Bug #7054: Quests aren't sorted by name
Bug #7064: NPCs don't report crime if the player is casting offensive spells on them while sneaking Bug #7064: NPCs don't report crime if the player is casting offensive spells on them while sneaking
Bug #7077: OpenMW fails to load certain particle effects in .osgt format
Bug #7084: Resurrecting an actor doesn't take into account base record changes Bug #7084: Resurrecting an actor doesn't take into account base record changes
Bug #7088: Deleting last save game of last character doesn't clear character name/details Bug #7088: Deleting last save game of last character doesn't clear character name/details
Bug #7092: BSA archives from higher priority directories don't take priority Bug #7092: BSA archives from higher priority directories don't take priority

2
components/resource/bulletshapemanager.cpp
View File

@ -74,7 +74,7 @@ namespace Resource
osg::ref_ptr<BulletShape> getShape() osg::ref_ptr<BulletShape> getShape()
{ {
if (!mTriangleMesh) if (!mTriangleMesh || mTriangleMesh->getNumTriangles() == 0)
return osg::ref_ptr<BulletShape>(); return osg::ref_ptr<BulletShape>();
osg::ref_ptr<BulletShape> shape(new BulletShape); osg::ref_ptr<BulletShape> shape(new BulletShape);