lighting fix for generated normals

Change-Id: I0c72e7585c9a24c4146b63e99100db4c76b9f008
Merge topic 'lighting_fix' into master

fbc4da94 lighting fix for generated normals