Merge branch 'next' of https://github.com/blackberry/GamePlay into next

gameplay/src/Mesh.cpp

@@ -282,7 +282,7 @@ void Mesh::setPrimitiveType(PrimitiveType type)
     _primitiveType = type;
 }
 
-void Mesh::setVertexData(float* vertexData, unsigned int vertexStart, unsigned int vertexCount)
+void Mesh::setVertexData(const float* vertexData, unsigned int vertexStart, unsigned int vertexCount)
 {
     GL_ASSERT( glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer) );
 

gameplay/src/Mesh.h

@@ -197,7 +197,7 @@ public:
      * @param vertexStart The index of the starting vertex (0 by default).
      * @param vertexCount The number of vertices to be set (default is 0, for all vertices).
      */
-    void setVertexData(float* vertexData, unsigned int vertexStart = 0, unsigned int vertexCount = 0);
+    void setVertexData(const float* vertexData, unsigned int vertexStart = 0, unsigned int vertexCount = 0);
 
     /**
      * Creates and adds a new part of primitive data defining how the vertices are connected.

gameplay/src/MeshPart.cpp

@@ -104,7 +104,7 @@ bool MeshPart::isDynamic() const
     return _dynamic;
 }
 
-void MeshPart::setIndexData(void* indexData, unsigned int indexStart, unsigned int indexCount)
+void MeshPart::setIndexData(const void* indexData, unsigned int indexStart, unsigned int indexCount)
 {
     GL_ASSERT( glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer) );
 

gameplay/src/MeshPart.h

@@ -72,7 +72,7 @@ public:
      * @param indexCount The number of indices to be set.
      * @script{ignore}
      */
-    void setIndexData(void* indexData, unsigned int indexStart, unsigned int indexCount);
+    void setIndexData(const void* indexData, unsigned int indexStart, unsigned int indexCount);
 
 private: