Pillar normal map fixed
Merge remote-tracking branch 'origin/master' into Normal-Mapping