From 2d15461d67156f7949e64ac14574e3a6cfcd5d2a Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Tue, 27 Apr 2021 08:09:25 -0700 Subject: [PATCH] Working to fix rebuild errors --- .../DesignTools/Operations/FitToBoundsObject3D_2.cs | 7 ++++++- MatterControlLib/DesignTools/Primitives/TextObject3D.cs | 5 +---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs b/MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs index 901babe3f..45dd0614b 100644 --- a/MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs +++ b/MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs @@ -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; } diff --git a/MatterControlLib/DesignTools/Primitives/TextObject3D.cs b/MatterControlLib/DesignTools/Primitives/TextObject3D.cs index e7089da86..3cf7feef0 100644 --- a/MatterControlLib/DesignTools/Primitives/TextObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/TextObject3D.cs @@ -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)) {