From 6315515d4dce0d88a20db345742d41a5bb5f5628 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 14 Jun 2018 09:56:24 -0700 Subject: [PATCH] Make SubtractAndReplace rebuild on color and material child change issue: MatterHackers/MCCentral#3603 Changing the inner objects material does not cause subtract and replace to update --- PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs | 2 ++ Submodules/agg-sharp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs b/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs index 0cb446e80..888fae932 100644 --- a/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs +++ b/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs @@ -56,6 +56,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D { if ((invalidateType.InvalidateType == InvalidateType.Content || invalidateType.InvalidateType == InvalidateType.Matrix + || invalidateType.InvalidateType == InvalidateType.Color + || invalidateType.InvalidateType == InvalidateType.Material || invalidateType.InvalidateType == InvalidateType.Mesh) && invalidateType.Source != this && !RebuildSuspended) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 205ab3d4f..318ba954c 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 205ab3d4f7fdf1744ed8ff554ab504d0f823edc2 +Subproject commit 318ba954c3fa9f75d0f95a171fe0faaac602985a