Commit 14f8b427 authored by Michalel Halle's avatar Michalel Halle

Looks like Sun OpenGL 1.1 and 1.2 (at least) need to have blending

disabled.  This "fix" undoes the previous one.
parent 197f8f49
......@@ -34,7 +34,7 @@
#include <limits.h>
#ifndef VTK_IMPLEMENT_MESA_CXX
vtkCxxRevisionMacro(vtkOpenGLImageMapper, "1.52");
vtkCxxRevisionMacro(vtkOpenGLImageMapper, "1.53");
vtkStandardNewMacro(vtkOpenGLImageMapper);
#endif
......@@ -583,7 +583,7 @@ void vtkOpenGLImageMapper::RenderData(vtkViewport* viewport,
int front =
(actor->GetProperty()->GetDisplayLocation() == VTK_FOREGROUND_LOCATION);
#if defined(sparc) && !defined(GL_VERSION_1_2)
#if defined(sparc) && defined(GL_VERSION_1_1)
glDisable(GL_BLEND);
#endif
switch (data->GetScalarType())
......@@ -670,7 +670,7 @@ void vtkOpenGLImageMapper::RenderData(vtkViewport* viewport,
glMatrixMode( GL_MODELVIEW);
glPopMatrix();
glEnable( GL_LIGHTING);
#if defined(sparc) && !defined(GL_VERSION_1_2)
#if defined(sparc) && defined(GL_VERSION_1_1)
glEnable(GL_BLEND);
#endif
}
......
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