Merge pull request #554 from pusewicz/fix-shapes3d-gles-uniforms