From a360cc1112d760fff73fdc580e52fdaf5d57deff Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 9 May 2018 09:29:54 -0700 Subject: [PATCH] Don't crash when we have bad data (should fix it at a higher level (rebuild from children)) --- DesignTools/Operations/Align3D.cs | 17 +++++++++++++---- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/DesignTools/Operations/Align3D.cs b/DesignTools/Operations/Align3D.cs index 7ee06248b..c090fd9b3 100644 --- a/DesignTools/Operations/Align3D.cs +++ b/DesignTools/Operations/Align3D.cs @@ -361,8 +361,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { if (XAlign == Align.None) { - // make sure it is where it started - AlignAxis(0, Align.Min, OriginalChildrenBounds[i].minXYZ.X, 0, child); + if (i < OriginalChildrenBounds.Count) + { + // make sure it is where it started + AlignAxis(0, Align.Min, OriginalChildrenBounds[i].minXYZ.X, 0, child); + } } else { @@ -380,7 +383,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } if (YAlign == Align.None) { - AlignAxis(1, Align.Min, OriginalChildrenBounds[i].minXYZ.Y, 0, child); + if (i < OriginalChildrenBounds.Count) + { + AlignAxis(1, Align.Min, OriginalChildrenBounds[i].minXYZ.Y, 0, child); + } } else { @@ -398,7 +404,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } if (ZAlign == Align.None) { - AlignAxis(2, Align.Min, OriginalChildrenBounds[i].minXYZ.Z, 0, child); + if (i < OriginalChildrenBounds.Count) + { + AlignAxis(2, Align.Min, OriginalChildrenBounds[i].minXYZ.Z, 0, child); + } } else { diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 1cec8e732..43bee860f 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 1cec8e732bb95f09fdad483470f8afa84de670e8 +Subproject commit 43bee860f8887ca6c6d64116fb3ed3b3edb61f3c diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 1ec939790..eaeaa76c2 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 1ec9397907ccc1a191421c10278ceec0d99b7687 +Subproject commit eaeaa76c2bf42789a494e6a58a54a434f2cc4c27