Blender Git Loki

Regression file teapot.blend didn't render... this due to a hack removal of
a month ago (trying to cope with vertexcolor 'paint' and 'light'.)
Forgot to add the correct check for calculaing UV texture coords, needed to
have vertexcolor 'paint' working.