Merge topic 'fix-env' into release

888d2c1c Fix environment map orientation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Joachim Pouderoux <joachim.pouderoux@kitware.com>
Merge-request: !6718

Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx

@@ -2573,6 +2573,13 @@ void vtkOpenGLPolyDataMapper::SetCameraShaderParameters(
     }
   }
 
+  if (program->IsUniformUsed("envMatrix"))
+  {
+    vtkMatrix3x3::Invert(norms, this->TempMatrix3);
+    vtkMatrix3x3::Multiply3x3(this->TempMatrix3, env, this->TempMatrix3);
+    program->SetUniformMatrix("envMatrix", this->TempMatrix3);
+  }
+
   if (program->IsUniformUsed("cameraParallel"))
   {
     program->SetUniformi("cameraParallel", cam->GetParallelProjection());