From e0e2bcf20a802eca85c599f27512848c17ea4eb1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 22 Mar 2023 08:47:42 +0100 Subject: [PATCH] Ensure 3D shapes are always shown in footprint settings dialog. Fixes #14371 https://gitlab.com/kicad/code/kicad/issues/14371 --- 3d-viewer/3d_rendering/opengl/create_scene.cpp | 3 ++- 3d-viewer/3d_rendering/raytracing/create_scene.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/3d-viewer/3d_rendering/opengl/create_scene.cpp b/3d-viewer/3d_rendering/opengl/create_scene.cpp index c60b8469f1..8cb5ab6139 100644 --- a/3d-viewer/3d_rendering/opengl/create_scene.cpp +++ b/3d-viewer/3d_rendering/opengl/create_scene.cpp @@ -912,7 +912,8 @@ void RENDER_3D_OPENGL::load3dModels( REPORTER* aStatusReporter ) if( !m_boardAdapter.GetBoard() ) return; - if( !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal + if( !m_boardAdapter.m_IsPreviewer + && !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal && !m_boardAdapter.m_Cfg->m_Render.show_footprints_insert && !m_boardAdapter.m_Cfg->m_Render.show_footprints_virtual ) { diff --git a/3d-viewer/3d_rendering/raytracing/create_scene.cpp b/3d-viewer/3d_rendering/raytracing/create_scene.cpp index 9891473558..9d51214eac 100644 --- a/3d-viewer/3d_rendering/raytracing/create_scene.cpp +++ b/3d-viewer/3d_rendering/raytracing/create_scene.cpp @@ -1202,7 +1202,8 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa if( !m_boardAdapter.GetBoard() ) return; - if( !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal + if( !m_boardAdapter.m_IsPreviewer + && !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal && !m_boardAdapter.m_Cfg->m_Render.show_footprints_insert && !m_boardAdapter.m_Cfg->m_Render.show_footprints_virtual ) {