Remove color hack in primitive rendering

Lighting was fixed in grip.
Merge remote-tracking branch 'origin/master'