Merge remote-tracking branch 'origin/master'

9 years ago · f9f91d5386
parent cee608e31b 4e5462bc19
commit f9f91d5386
1 changed files with 5 additions and 0 deletions
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@ -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)