From 697329f12812c21efa74fa7a15f46e95af454022 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 26 Jun 2014 03:33:09 +0200
Subject: [PATCH] Fix crash for in_dagoth_bridge00.nif (Fixes #1561)

This one is causing trouble by using an unnamed node, will need some more work.
---
 apps/openmw/mwworld/physicssystem.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index c4b904ca9..87ec39707 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -60,6 +60,12 @@ void animateCollisionShapes (std::map<OEngine::Physic::RigidBody*, OEngine::Phys
         {
             Ogre::Node* bone = animation->getNode(shapeIt->first);
 
+            // FIXME: this will happen for nodes with empty names. Ogre's SkeletonInstance::cloneBoneAndChildren
+            // will assign an auto-generated name if the bone name was empty. We could use the bone handle instead of
+            // the bone name, but that is a bit tricky to retrieve.
+            if (bone == NULL)
+                continue;
+
             btCompoundShape* compound = dynamic_cast<btCompoundShape*>(instance.mCompound);
 
             btTransform trans;