ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-13 17:18:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Build GEOM with OCCT dev version.

Browse Source
This commit is contained in:
rnv 2020-07-23 16:18:07 +03:00
parent 090649639c
commit 7cd67a0174
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -126,6 +126,10 @@
#include <TColStd_HArray1OfByte.hxx> #include <TColStd_HArray1OfByte.hxx>
#if OCC_VERSION_LARGE > 0x07040000
#include <Image_SupportedFormats.hxx>
#endif
// If the next macro is defined, autocolor feature works for all sub-shapes; // If the next macro is defined, autocolor feature works for all sub-shapes;
// if it is undefined, autocolor feature works for groups only // if it is undefined, autocolor feature works for groups only
#define GENERAL_AUTOCOLOR #define GENERAL_AUTOCOLOR
@ -242,8 +246,12 @@ namespace
const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap(); const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap();
if ( aTexture.IsNull() ) if ( aTexture.IsNull() )
continue; continue;
#if OCC_VERSION_LARGE > 0x07040000
Handle(Image_SupportedFormats) aFormats = new Image_SupportedFormats();
const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(aFormats);
#else
const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(); const Handle(Image_PixMap)& aPixmap = aTexture->GetImage();
#endif
if ( aPixmap.IsNull() ) if ( aPixmap.IsNull() )
continue; continue;