Couple optimization when applying the uniform overrides
Merge branch 'dev' of https://github.com/Verold/three.js into dev