Merge pull request #3421 from larsbrubaker/design_tools

Make SubtractAndReplace rebuild on color and material child change
This commit is contained in:
Lars Brubaker 2018-06-14 10:15:46 -07:00 committed by GitHub
commit 05acb62286
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View file

@ -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)

@ -1 +1 @@
Subproject commit 205ab3d4f7fdf1744ed8ff554ab504d0f823edc2
Subproject commit 318ba954c3fa9f75d0f95a171fe0faaac602985a