ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-14 09:38:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev

Browse Source
This commit is contained in:
Gilles DAVID 2017-03-29 09:51:35 +02:00
commit b0f67e0ecd
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GEOM/CMakeLists.txt
View File

@ -39,6 +39,7 @@ SET(_link_LIBRARIES
${CAS_TKLCAF} ${CAS_TKLCAF}
${CAS_TKCDF} ${CAS_TKCDF}
${CAS_TKG3d} ${CAS_TKG3d}
${CAS_TKStdL}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil} ${KERNEL_OpUtil}
GEOMSketcher GEOMSketcher

2
src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx
View File

@ -273,7 +273,7 @@ bool MeasureGUI_AnnotationInteractor::eventFilter( QObject* theObject, QEvent* t
{ {
const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext(); const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
if ( anAISContext->IsHilighted( myActiveIO ) ) if ( anAISContext->IsHilighted( Handle(AIS_InteractiveObject)::DownCast( myActiveIO ) ) )
{ {
anAISContext->Unhilight( myActiveIO, Standard_False ); anAISContext->Unhilight( myActiveIO, Standard_False );
} }

1
src/OBJECT/CMakeLists.txt
View File

@ -48,6 +48,7 @@ SET(_link_LIBRARIES
OCC2VTK OCC2VTK
SalomeIDLGEOM SalomeIDLGEOM
${CAS_TKBRep} ${CAS_TKBRep}
${CAS_TKOpenGl}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GUI_SalomeObject} ${GUI_SalomeObject}
${GUI_SVTK} ${GUI_SVTK}