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

Make sure we don't rebuild during clone

Browse source
This commit is contained in:
LarsBrubaker 2020-11-17 07:55:49 -08:00
parent 290cae696c
commit fa8dd5c5b4
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/DesignTools/Primitives/TextObject3D.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.DesignTools
if (!this.Children.Where(c => c.Mesh != null).Any()
&& !RebuildLocked)
{
this.Invalidate(InvalidateType.Properties);
this.Rebuild().Wait();
}
return base.Mesh;

3
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -60,7 +60,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (source is Object3D object3D
&& color != source.Color
&& color.alpha != 255)
&& color.alpha < 255
&& color.alpha > 0)
{
object3D.EnsureTransparentSorting();
}

3
MatterControlLib/PartPreviewWindow/View3D/Object3DControlsLayer.cs
View file

@ -857,7 +857,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
if (drawColor.alpha != 255
if (drawColor.alpha < 255
&& drawColor.alpha > 0
&& item is Object3D item3D)
{
item3D.EnsureTransparentSorting();

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 644bf5edac1fa7cd579381c4d285405755f8e4b7
Subproject commit c18ecbe08a331cfd860edc7e635cbb82e044fe5b