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

Fix collision for nodes with MRK extra data (Fixes #2415)

Browse source
This commit is contained in:
scrawl 2015-03-02 01:03:03 +01:00
parent fb0fdf0312
commit 0ad514b29b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/nifbullet/bulletnifloader.cpp
View file

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