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

Working to fix rebuild errors

Browse source
This commit is contained in:
LarsBrubaker 2021-04-27 08:09:25 -07:00
parent a93d0724fc
commit 2d15461d67
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs
View file

@ -48,6 +48,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public class FitToBoundsObject3D_2 : TransformWrapperObject3D, ISelectedEditorDraw
{
private Vector3 boundsSize;
private InvalidateType additonalInvalidate;
public FitToBoundsObject3D_2()
{
@ -177,6 +178,8 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
additonalInvalidate = invalidateType.InvalidateType;
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
@ -199,6 +202,8 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
base.OnInvalidate(invalidateType);
additonalInvalidate = InvalidateType.None;
}
public override Task Rebuild()
@ -214,7 +219,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Matrix | additonalInvalidate));
return Task.CompletedTask;
}

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

@ -135,10 +135,7 @@ namespace MatterHackers.MatterControl.DesignTools
var rebuildLock = RebuildLock();
return ApplicationController.Instance.Tasks.Execute(
"Generating Text Meshes".Localize(),
null,
(reporter, cancellationToken) =>
return Task.Run(() =>
{
using (new CenterAndHeightMaintainer(this))
{