Eliminate shadowed-variable warnings.

Change-Id: I327156c6b53a43cd7c95ff33d63ffb9a08180921
Merge topic 'scalarbar_from_vtk' into next

bdccff4 Eliminate shadowed-variable warnings.