Merge pull request #953 from SteelFill/lights_bugfix

Fix Lights Crash on Corrupt Shapes

Author: cjakeman

Source/RunActivity/Viewer3D/Shapes.cs

@@ -277,9 +277,26 @@ public class PoseableShape : StaticShape
         public PoseableShape(Viewer viewer, string path, WorldPosition initialPosition, ShapeFlags flags)
             : base(viewer, path, initialPosition, flags)
         {
-            XNAMatrices = new Matrix[SharedShape.Matrices.Length];
-            for (int iMatrix = 0; iMatrix < SharedShape.Matrices.Length; ++iMatrix)
-                XNAMatrices[iMatrix] = SharedShape.Matrices[iMatrix];
+            if (SharedShape.Matrices.Length > 0)
+            {
+                XNAMatrices = new Matrix[SharedShape.Matrices.Length];
+                for (int iMatrix = 0; iMatrix < SharedShape.Matrices.Length; ++iMatrix)
+                    XNAMatrices[iMatrix] = SharedShape.Matrices[iMatrix];
+            }
+            else // If the shape file is missing or fails to load, we need some default data to prevent crashes
+            {
+                if (path != null && path != "Empty")
+                {
+                    string location = path;
+                    if (path != null && path.Contains('\0'))
+                        location = path.Split('\0')[0];
+
+                    Trace.TraceWarning("Couldn't load shape {0} file may be corrupt", location);
+                }
+                // The 0th matrix should always be the identity matrix
+                XNAMatrices = new Matrix[1];
+                XNAMatrices[0] = Matrix.Identity;
+            }
 
             if (SharedShape.LodControls.Length > 0 && SharedShape.LodControls[0].DistanceLevels.Length > 0 && SharedShape.LodControls[0].DistanceLevels[0].SubObjects.Length > 0 && SharedShape.LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives.Length > 0)
                 Hierarchy = SharedShape.LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives[0].Hierarchy;