f3c231d641
- switches opencascade to vtk9 to enable upcoming import of
cad/py-ocp
- cad/freecad has to switch vtk8 -> vtk9, too
- this requires upstream commit 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25
"Make smesh compile with vtk9"
- while touching this, fixes vtk module detection
- clean up VTK_DIR usage: that variable does not exist in FreeCAD's
build system anymore (for quite some time, actually)
Obtained from: opencascade upstream: Kirill Gavrilov
Obtained from: freecad upstream: committed by github/wwmayer
Differential Revision: D30934
Reported by: thierry@
Submitted by: thierry@
15 lines
406 B
C++
15 lines
406 B
C++
--- src/IVtkDraw/IVtkDraw.cxx.orig 2020-11-03 14:50:01 UTC
|
|
+++ src/IVtkDraw/IVtkDraw.cxx
|
|
@@ -36,6 +36,12 @@
|
|
#include <V3d_TypeOfOrientation.hxx>
|
|
#include <Aspect_DisplayConnection.hxx>
|
|
|
|
+// Preventing naming collisions between
|
|
+// GLX and VTK versions 9.0 and above
|
|
+#ifdef AllValues
|
|
+#undef AllValues
|
|
+#endif
|
|
+
|
|
#include <IVtk_Types.hxx>
|
|
#include <IVtkVTK_ShapeData.hxx>
|
|
#include <IVtkOCC_Shape.hxx>
|