Merge remote-tracking branch 'origin/master' into Shadows

2016-03-03 03:30:01 +01:00
parent 7ea26d10ee f0c2fdead1
commit a0f2f2bf5f
96 changed files with 22437 additions and 797 deletions
@@ -74,7 +74,7 @@ void FrameBuffer::Generate()
 	}
 	GLERROR("3");

-    GLenum* bufferTextures = &attachments[0];
+    GLenum* bufferTextures = attachments.data();
    glDrawBuffers(attachments.size(), bufferTextures);
    if (GLERROR("GLBufferAttachement error")) {
        printf(": AttachmentSize %i", attachments.size());