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

Fixing multi material processing

Browse source
This commit is contained in:
Lars Brubaker 2017-07-17 16:41:04 -07:00
parent a4e8e3c1e6
commit c989cb8630
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/View3D/InteractionLayer.cs
View file

@ -220,7 +220,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public InteractionVolume SelectedInteractionVolume { get; set; } = null;
public InteractionVolume HoveredInteractionVolume { get; set; } = null;
public double SnapGridDistance { get; set; }
public double SnapGridDistance { get; set; } = 1;
public GuiWidget GuiSurface => this;
}

7
SlicerConfiguration/SlicingQueue.cs
View file

@ -165,7 +165,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
foreach (Mesh mesh in meshGroup.Meshes)
{
MeshExtruderData material = MeshExtruderData.Get(mesh);
int extruderIndex = Math.Max(0, material.ExtruderIndex - 1);
int extruderIndex = Math.Max(0, material.ExtruderIndex);
maxExtruderIndex = Math.Max(maxExtruderIndex, extruderIndex);
if (extruderIndex >= extruderCount)
{
@ -201,7 +201,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
for (int meshIndex = 0; meshIndex < meshCount; meshIndex++)
{
Mesh mesh = meshGroup.Meshes[meshIndex];
if ((meshIndex % 2) == 0)
if (meshIndex == 0)
{
mergeRules += "({0}".FormatWith(savedStlCount);
}
@ -224,7 +224,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
savedStlCount++;
}
for (int i = 0; i < meshCount; i++)
int closeParentsCount = (meshCount == 1 || meshCount == 2) ? 1 : meshCount - 1;
for (int i = 0; i < closeParentsCount; i++)
{
mergeRules += ")";
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit d77505eacee3d4d89a399288f75935a9b98756fa
Subproject commit 0df89d544f83e0359fb512a4b83e1fc91c23890e