From f66ccfb64ff78248cfafb08f158c98809e40f974 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 26 Nov 2018 15:58:54 +0100 Subject: [PATCH] 3D viewer: Fix hanging when a board is displayed in non realistic mode and the body is not shown. --- .../c3d_render_createscene_ogl_legacy.cpp | 8 +++----- .../3d_render_ogl_legacy/clayer_triangles.cpp | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp index bcd099b0d3..659ce1edd7 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp @@ -615,11 +615,9 @@ void C3D_RENDER_OGL_LEGACY::reload( REPORTER *aStatusTextReporter ) { const SHAPE_POLY_SET *polyList = map_poly.at( layer_id ); - layerTriangles->AddToMiddleContourns( *polyList, - layer_z_bot, - layer_z_top, - m_settings.BiuTo3Dunits(), - false ); + if( polyList->OutlineCount() > 0 ) + layerTriangles->AddToMiddleContourns( *polyList, layer_z_bot, layer_z_top, + m_settings.BiuTo3Dunits(), false ); } // Create display list diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp b/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp index 942a8fee5a..6a0f28e823 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp @@ -282,8 +282,6 @@ void CLAYER_TRIANGLES::AddToMiddleContourns( const SHAPE_POLY_SET &aPolySet, double aBiuTo3Du, bool aInvertFaceDirection ) { - wxASSERT( aPolySet.OutlineCount() > 0 ); - if( aPolySet.OutlineCount() == 0 ) return;