Corrected render ordering of polys and strips.

Rendering/vtkOpenGLPolyDataMapper.cxx

@@ -2506,8 +2506,8 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
     
   prims[0] = input->GetVerts();
   prims[1] = input->GetLines();
-  prims[2] = input->GetStrips();
-  prims[3] = input->GetPolys();
+  prims[2] = input->GetPolys();
+  prims[3] = input->GetStrips();
 
   t = input->GetPointData()->GetTCoords();
   if ( t ) 
@@ -2772,12 +2772,17 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
     glDisable( GL_LIGHTING);
     }
   
+  // do polys
+  aPrim = prims[2];
+  aGlFunction = glFunction[3];
+  draw3(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
+
   // do tstrips
   if ( zResolve )
     {
     glDepthRange(2*zRes, 1.);
     }
-  aPrim = prims[2];
+  aPrim = prims[3];
   aGlFunction = glFunction[2];
   draw2(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
   if (rep == VTK_WIREFRAME)   
@@ -2785,11 +2790,6 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
     draw2W(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
     }
 
-  // do polys
-  aPrim = prims[3];
-  aGlFunction = glFunction[3];
-  draw3(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
-
   // enable lighting again if necessary
   if (!n && rep == VTK_POINTS)
     {