teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Marker collision fix (Fixes #2461)

Browse source
This commit is contained in:
scrawl 2015-03-19 15:51:45 +01:00
parent d573458896
commit 7bc0d41bb0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nifbullet/bulletnifloader.cpp
View file

@ -274,9 +274,9 @@ void ManualBulletShapeLoader::handleNode(const Nif::Node *node, int flags,
// No collision. Use an internal flag setting to mark this. // No collision. Use an internal flag setting to mark this.
flags |= 0x800; flags |= 0x800;
} }
else if (sd->string == "MRK" && !mShowMarkers && raycasting) else if (sd->string == "MRK" && !mShowMarkers && (raycasting || mShape->mAutogenerated))
{ {
// Marker objects should be invisible, but still have collision. // Marker objects should be invisible, but can still have collision if the model explicitely specifies it via a RootCollisionNode.
// Except in the editor, the marker objects are visible. // Except in the editor, the marker objects are visible.
return; return;
} }