From 9a3ededecc1630ea6b002c98fddabd273cf44558 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 7 Aug 2018 14:03:35 -0700 Subject: [PATCH] Move up_pointer.stl to Stls folder --- PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs | 6 +++--- StaticData/{Icons/3D Icons => Stls}/up_pointer.stl | Bin 2 files changed, 3 insertions(+), 3 deletions(-) rename StaticData/{Icons/3D Icons => Stls}/up_pointer.stl (100%) diff --git a/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs b/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs index cc93b77bc..94cc18cbb 100644 --- a/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs +++ b/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs @@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow DrawOnTop = true; - using (Stream arrowStream = AggContext.StaticData.OpenStream(Path.Combine("Icons", "3D Icons", "up_pointer.stl"))) + using (Stream arrowStream = AggContext.StaticData.OpenStream(Path.Combine("Stls", "up_pointer.stl"))) { upArrowMesh = StlProcessing.Load(arrowStream, CancellationToken.None); } @@ -189,7 +189,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var selectedItem = InteractionContext.Scene.RootSelectedItem; - if (mouseEvent3D.info != null + if (mouseEvent3D.info != null && selectedItem != null) { HadClickOnControl = true; @@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { IntersectInfo info = hitPlane.GetClosestIntersection(mouseEvent3D.MouseRay); - if (info != null + if (info != null && selectedItem != null) { var delta = info.HitPosition.Z - initialHitPosition.Z; diff --git a/StaticData/Icons/3D Icons/up_pointer.stl b/StaticData/Stls/up_pointer.stl similarity index 100% rename from StaticData/Icons/3D Icons/up_pointer.stl rename to StaticData/Stls/up_pointer.stl