Beginnings of a mix shader
Finalized mix algorithm
Fixed slight hole in mix algo, added UI
Added scale/offset to mix textures
Fixed breaking typo
Added lighting uniforms
Add 'mix' option to material selection GUI
Switched from original shader to modified phong
Fixed funky bug in shader
Added lots of phong uniforms
Merge remote-tracking branch 'origin/development' into mix-shader
Better color normalizing
Minor cleanup
Merge remote-tracking branch 'origin/development' into mix-shader
fix for windows drivers
Merge branch 'mix-shader' into development