Skip to content

Commit

Permalink
Merge pull request OpenMW#1604
Browse files Browse the repository at this point in the history
  • Loading branch information
scrawl committed Feb 13, 2018
2 parents 123f7b8 + 5502790 commit ac1609c
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions components/nifbullet/bulletnifloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,23 +245,13 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
{
assert(shape != NULL);

// Interpret flags
bool hidden = (flags&Nif::NiNode::Flag_Hidden) != 0;
bool collide = (flags&Nif::NiNode::Flag_MeshCollision) != 0;
bool bbcollide = (flags&Nif::NiNode::Flag_BBoxCollision) != 0;

// If the object was marked "NCO" earlier, it shouldn't collide with
// anything. So don't do anything.
if ((flags & 0x800))
{
return;
}

if (!collide && !bbcollide && hidden)
// This mesh apparently isn't being used for anything, so don't
// bother setting it up.
return;

if (!shape->skin.empty())
isAnimated = false;

Expand Down

0 comments on commit ac1609c

Please sign in to comment.