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

Fix step model colors again 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13882


(cherry picked from commit df022acc11)
This commit is contained in:
Marek Roszko 2023-02-13 22:21:20 -05:00 committed by Mark Roszko
parent a48eace90a
commit 0ecc36c4a5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/3d/oce/loadmodel.cpp
View File

@ -1000,13 +1000,15 @@ bool processLabel( const TDF_Label& aLabel, DATA& aData, SGNODE* aParent,
ret = true; ret = true;
} }
// Get all shells, avoid those that may be attached to solids
for( xp.Init( shape, TopAbs_SHELL, TopAbs_SOLID ); xp.More(); xp.Next() ) for( xp.Init( shape, TopAbs_SHELL, TopAbs_SOLID ); xp.More(); xp.Next() )
{ {
processShell( xp.Current(), aData, pptr, aItems, nullptr ); processShell( xp.Current(), aData, pptr, aItems, nullptr );
ret = true; ret = true;
} }
for( xp.Init( shape, TopAbs_FACE ); xp.More(); xp.Next() ) // Get all faces, avoid those that may be attached to shells
for( xp.Init( shape, TopAbs_FACE, TopAbs_SHELL ); xp.More(); xp.Next() )
{ {
const TopoDS_Face& face = TopoDS::Face( xp.Current() ); const TopoDS_Face& face = TopoDS::Face( xp.Current() );
processFace( face, aData, pptr, aItems, nullptr ); processFace( face, aData, pptr, aItems, nullptr );

2
plugins/3d/oce/oce.cpp
View File

@ -37,7 +37,7 @@ SCENEGRAPH* LoadModel( char const* filename );
#define PLUGIN_OCE_MAJOR 1 #define PLUGIN_OCE_MAJOR 1
#define PLUGIN_OCE_MINOR 4 #define PLUGIN_OCE_MINOR 4
#define PLUGIN_OCE_PATCH 0 #define PLUGIN_OCE_PATCH 1
#define PLUGIN_OCE_REVNO 0 #define PLUGIN_OCE_REVNO 0