From c8ac16e8063c309a70d471aa4ff0e65eb0970f31 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 23 Feb 2018 12:03:52 -0800 Subject: [PATCH] Check the world persistable flag --- Library/Export/StlExport.cs | 2 +- PartPreviewWindow/View3D/MeshViewerWidget.cs | 2 +- SlicerConfiguration/Slicer.cs | 3 ++- Submodules/agg-sharp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Export/StlExport.cs b/Library/Export/StlExport.cs index 6dd27d46f..bc37cd313 100644 --- a/Library/Export/StlExport.cs +++ b/Library/Export/StlExport.cs @@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.Library.Export return MeshExport.ExportMesh(libraryItem, outputPath); } - return null; + return Task.FromResult(false); } } } diff --git a/PartPreviewWindow/View3D/MeshViewerWidget.cs b/PartPreviewWindow/View3D/MeshViewerWidget.cs index 288d22376..88d08a277 100644 --- a/PartPreviewWindow/View3D/MeshViewerWidget.cs +++ b/PartPreviewWindow/View3D/MeshViewerWidget.cs @@ -431,7 +431,7 @@ namespace MatterHackers.MeshVisualizer item.Mesh.FaceTexture.TryGetValue((item.Mesh.Faces[0], 0), out faceTexture); bool hasPersistableTexture = faceTexture == MeshViewerWidget.ViewOnlyTexture; - if (item.Persistable) + if (item.WorldPersistable()) { if (hasPersistableTexture) { diff --git a/SlicerConfiguration/Slicer.cs b/SlicerConfiguration/Slicer.cs index e42db173d..752943762 100644 --- a/SlicerConfiguration/Slicer.cs +++ b/SlicerConfiguration/Slicer.cs @@ -90,7 +90,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration meshPrintOutputSettings.Clear(); // Flatten the scene, filtering out items outside of the build volume - var meshItemsOnBuildPlate = reloadedItem.VisibleMeshes().Where((item) => item.InsideBuildVolume(printer)); + var meshItemsOnBuildPlate = reloadedItem.VisibleMeshes().Where((item) => item.InsideBuildVolume(printer) + && item.WorldPersistable()); if (meshItemsOnBuildPlate.Any()) { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index a95cf487f..bea8649f3 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit a95cf487f2e4ecb5fcb574a6e30f6ed73344a4c6 +Subproject commit bea8649f3e1545c106b93e7bb9c2d18dec7c0332