nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3035 from larsbrubaker/design_tools

Browse source 
Check the world persistable flag
This commit is contained in:
Lars Brubaker 2018-02-23 13:46:25 -08:00 • committed by GitHub
commit 08ed4a67cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Library/Export/StlExport.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.Library.Export
return MeshExport.ExportMesh(libraryItem, outputPath); return MeshExport.ExportMesh(libraryItem, outputPath);
} }
return null; return Task.FromResult(false);
} }
} }
} }

2
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -431,7 +431,7 @@ namespace MatterHackers.MeshVisualizer
item.Mesh.FaceTexture.TryGetValue((item.Mesh.Faces[0], 0), out faceTexture); item.Mesh.FaceTexture.TryGetValue((item.Mesh.Faces[0], 0), out faceTexture);
bool hasPersistableTexture = faceTexture == MeshViewerWidget.ViewOnlyTexture; bool hasPersistableTexture = faceTexture == MeshViewerWidget.ViewOnlyTexture;
if (item.Persistable) if (item.WorldPersistable())
{ {
if (hasPersistableTexture) if (hasPersistableTexture)
{ {

3
SlicerConfiguration/Slicer.cs
View file

@ -90,7 +90,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
meshPrintOutputSettings.Clear(); meshPrintOutputSettings.Clear();
// Flatten the scene, filtering out items outside of the build volume // 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()) if (meshItemsOnBuildPlate.Any())
{ {

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit a95cf487f2e4ecb5fcb574a6e30f6ed73344a4c6 Subproject commit bea8649f3e1545c106b93e7bb9c2d18dec7c0332