Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-09-20 22:07:56 +02:00
39 changed files with 2994 additions and 2168 deletions

View File

@@ -348,10 +348,16 @@ void CSkyDome::RebuildColors() {
if( m_coloursbuffer != -1 ) {
// the colour buffer was already initialized, so on this run we update its content
// cache entry state
::glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT );
// begin
::glEnableClientState( GL_VERTEX_ARRAY );
// update
::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer );
::glBufferSubData( GL_ARRAY_BUFFER, 0, m_colours.size() * sizeof( glm::vec3 ), m_colours.data() );
// cleanup
::glPopClientAttrib();
}
}
//******************************************************************************//