fix some picking issues

Change-Id: Ia0607e1323ba89139f04209019228913ab0a1bc9
Merge branch 'opengl2-rendering' of https://github.com/cryos/VTK into opengl2-rendering

Change-Id: Ib8044138cf410ab3f0495e7bb9ae7fde4b6eb454