Commit e8ef93a0 authored by Michael Migliore's avatar Michael Migliore Committed by Kitware Robot

Merge topic 'fix-normalmapping'

35a78e4e Fix normal mapping when displaying edges
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal's avatarMathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !6049
parents 4c18c2f7 35a78e4e
Pipeline #148094 failed with stage
in 0 seconds
......@@ -1707,7 +1707,9 @@ void vtkOpenGLPolyDataMapper::ReplaceShaderNormal(
bool normalTex = std::find_if(textures.begin(), textures.end(), [](const texinfo& tex) {
return tex.second == "normalTex";
}) != textures.end();
if (normalTex && this->VBOs->GetNumberOfComponents("tangentMC") == 3)
if (normalTex
&& this->VBOs->GetNumberOfComponents("tangentMC") == 3
&& !this->DrawingEdgesOrVertices)
{
vtkShaderProgram::Substitute(VSSource,
"//VTK::Normal::Dec",
......
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