diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs index 37d4aa725..a5d86cd4e 100644 --- a/PartPreviewWindow/View3DTransfromPart.cs +++ b/PartPreviewWindow/View3DTransfromPart.cs @@ -668,7 +668,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private void LoadAndAddPartsToPlate(string[] filesToLoad) { - if (Meshes.Count > 0 && filesToLoad.Length > 0) + if (Meshes.Count > 0 && filesToLoad != null && filesToLoad.Length > 0) { string loadingPartLabel = LocalizedString.Get("Loading Parts"); string loadingPartLabelFull = "{0}:".FormatWith(loadingPartLabel); diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index f0457e1d8..5aad44aa1 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -235,6 +235,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow renderType |= RenderType.Retractions; } + GCodeRenderer.ExtrusionColor = ActiveTheme.Instance.PrimaryAccentColor; gcodeViewWidget.gCodeRenderer.Render3D(0, Math.Min(gcodeViewWidget.ActiveLayerIndex + 1, gcodeViewWidget.LoadedGCode.NumChangesInZ), gcodeViewWidget.TotalTransform, 1, renderType, gcodeViewWidget.FeatureToStartOnRatio0To1, gcodeViewWidget.FeatureToEndOnRatio0To1); } diff --git a/StaticData/PrinterSettings/RoBo 3D/R1/config.ini b/StaticData/PrinterSettings/RoBo 3D/R1/config.ini index 56ea8ee81..6a59b55f4 100644 --- a/StaticData/PrinterSettings/RoBo 3D/R1/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/R1/config.ini @@ -106,7 +106,7 @@ solid_infill_extrusion_width = 0 solid_infill_speed = 60 spiral_vase = 0 standby_temperature_delta = -5 -start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\nM109 S[temperature] ; set the extruder temp and wait\nM565 Z0 ; Set the probe offset\nG29 ; probe bed\n +start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\nM109 S[temperature] ; set the extruder temp and wait\nM565 Z-1 ; Set the probe offset\nG29 ; probe bed\n start_perimeters_at_concave_points = 0 start_perimeters_at_non_overhang = 0 support_material = 1