Commit 0404df8b authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'fix-msaa'

d586c51c Fix failing test
82a6cacf Enable MSAA if available
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4676
parents 907fc2c3 d586c51c
......@@ -7,6 +7,7 @@ VTK_DATA_ROOT = vtkGetDataRoot()
#
ren1 = vtk.vtkRenderer()
renWin = vtk.vtkRenderWindow()
renWin.SetMultiSamples(0)
renWin.AddRenderer(ren1)
iren = vtk.vtkRenderWindowInteractor()
iren.SetRenderWindow(renWin)
......
......@@ -836,8 +836,7 @@ void vtkOpenGLState::Initialize(vtkOpenGLRenderWindow *)
? ::glEnable(GL_CULL_FACE) : ::glDisable(GL_CULL_FACE);
#ifdef GL_MULTISAMPLE
this->CurrentState.MultiSample
? glEnable(GL_MULTISAMPLE) : glDisable(GL_MULTISAMPLE);
this->CurrentState.MultiSample = glIsEnabled(GL_MULTISAMPLE) == GL_TRUE;
#endif
// initialize blending for transparency
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment