Shade mapping fix
SW T&L
Merge pull request #5612 from raven02/patch-27

Shade mapping fix