haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3D vrml export: fix for bug #1441734

This commit is contained in:
unknown 2015-04-10 09:30:21 +02:00 committed by jean-pierre charras
parent 44d6595c6a
commit d545c698fb
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
3d-viewer/3d_read_mesh.cpp
View File

@ -55,19 +55,7 @@ S3D_MODEL_PARSER *S3D_MODEL_PARSER::Create( S3D_MASTER* aMaster,
int S3D_MASTER::ReadData( S3D_MODEL_PARSER* aParser ) int S3D_MASTER::ReadData( S3D_MODEL_PARSER* aParser )
{ {
if( m_Shape3DName.IsEmpty() ) if( m_Shape3DFullFilename.IsEmpty() || aParser == NULL )
{
//DBG( printf("m_Shape3DName.IsEmpty") );
return -1;
}
if( m_Shape3DFullFilename.IsEmpty() )
{
//DBG( printf("m_Shape3DFullFilename.IsEmpty") );
return -1;
}
if( aParser == NULL )
return -1; return -1;
wxString filename = m_Shape3DFullFilename; wxString filename = m_Shape3DFullFilename;

11
pcbnew/exporters/export_vrml.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2009-2013 Lorenzo Mercantonio * Copyright (C) 2009-2013 Lorenzo Mercantonio
* Copyright (C) 2014 Cirilo Bernado * Copyright (C) 2014 Cirilo Bernado
* Copyright (C) 2013 Jean-Pierre Charras jp.charras at wanadoo.fr * Copyright (C) 2013 Jean-Pierre Charras jp.charras at wanadoo.fr
* Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -893,7 +893,6 @@ static void export_vrml_zones( MODEL_VRML& aModel, BOARD* aPcb )
const CPOLYGONS_LIST& poly = zone->GetFilledPolysList(); const CPOLYGONS_LIST& poly = zone->GetFilledPolysList();
int nvert = poly.GetCornersCount(); int nvert = poly.GetCornersCount();
int i = 0; int i = 0;
bool cutout = false;
while( i < nvert ) while( i < nvert )
{ {
@ -916,13 +915,7 @@ static void export_vrml_zones( MODEL_VRML& aModel, BOARD* aPcb )
++i; ++i;
} }
// KiCad ensures that the first polygon is the outline vl->EnsureWinding( seg, false );
// and all others are holes
vl->EnsureWinding( seg, cutout );
if( !cutout )
cutout = true;
++i; ++i;
} }
} }