From 711607f152933d36ba1867068497a89cc4ccbaaf Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 8 Feb 2016 14:04:42 +0100 Subject: [PATCH] Fix minor Bug #1542935 (No solder mask unless there is something on the layer) --- 3d-viewer/3d_draw_board_body.cpp | 5 ++++- pcbnew/github/github_plugin.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/3d-viewer/3d_draw_board_body.cpp b/3d-viewer/3d_draw_board_body.cpp index 724161abdd..ba42de1047 100644 --- a/3d-viewer/3d_draw_board_body.cpp +++ b/3d-viewer/3d_draw_board_body.cpp @@ -572,7 +572,10 @@ void EDA_3D_CANVAS::buildTechLayers3DView( REPORTER* aErrorMessages, REPORTER* a // bufferPolys contains polygons to merge. Many overlaps . // Calculate merged polygons and remove pads and vias holes - if( bufferPolys.IsEmpty() ) + if( layer != B_Mask && layer != F_Mask && bufferPolys.IsEmpty() ) + // if a layer has no iten to draw, skip it + // However solder mask layers are negative layers, so no item + // means only a full layer mask continue; // Solder mask layers are "negative" layers. diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp index ef592ea19a..75d4e7bfb0 100644 --- a/pcbnew/github/github_plugin.cpp +++ b/pcbnew/github/github_plugin.cpp @@ -194,6 +194,7 @@ MODULE* GITHUB_PLUGIN::FootprintLoad( const wxString& aLibraryPath, if( it != m_gh_cache->end() ) // fp_name is present { + //std::string::data() ensures that the referenced data block is contiguous. wxMemoryInputStream mis( m_zip_image.data(), m_zip_image.size() ); // This decoder should always be UTF8, since it was saved that way by git.