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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
Kevin Pope 2014-10-27 11:50:22 -07:00
commit caed3e4b52
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1630,14 +1630,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.SelectionChanged += (sender, e) => this.SelectionChanged += (sender, e) =>
{ {
Mesh mesh = SelectedMeshGroup.Meshes[0]; if (SelectedMeshGroup != null)
MeshMaterialData material = MeshMaterialData.Get(mesh);
for (int i = 0; i < extruderButtons.Count; i++)
{ {
if (material.MaterialIndex-1 == i) Mesh mesh = SelectedMeshGroup.Meshes[0];
MeshMaterialData material = MeshMaterialData.Get(mesh);
for (int i = 0; i < extruderButtons.Count; i++)
{ {
((RadioButton)extruderButtons[i]).Checked = true; if (material.MaterialIndex - 1 == i)
{
((RadioButton)extruderButtons[i]).Checked = true;
}
} }
} }
}; };

2
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
meshViewerWidget = new MeshViewerWidget(viewerVolume, bedCenter, bedShape, "".Localize()); meshViewerWidget = new MeshViewerWidget(viewerVolume, bedCenter, bedShape, "".Localize());
meshViewerWidget.AnchorAll(); meshViewerWidget.AnchorAll();
meshViewerWidget.AlwaysRenderBed = true; meshViewerWidget.AllowBedRenderingWhenEmpty = true;
gcodeDisplayWidget.AddChild(meshViewerWidget); gcodeDisplayWidget.AddChild(meshViewerWidget);
meshViewerWidget.Visible = false; meshViewerWidget.Visible = false;
meshViewerWidget.TrackballTumbleWidget.DrawGlContent += new EventHandler(TrackballTumbleWidget_DrawGlContent); meshViewerWidget.TrackballTumbleWidget.DrawGlContent += new EventHandler(TrackballTumbleWidget_DrawGlContent);