Shader: Linking in library, not adding as source
Shader: Tweaking shading formula
Merge branch 'shader' into develop