Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marc Zinnschlag 2016-02-21 09:01:17 +01:00
commit f9f91d5386

View file

@ -266,6 +266,11 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
if (!shape->skin.empty())
isAnimated = false;
if (shape->data.empty())
return;
if (shape->data->triangles->empty())
return;
if (isAnimated)
{
if (!mCompoundShape)