Commit 4327f6d4 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed glew and renderobject define collision

parent eca9790c
Pipeline #1923 passed with stage
......@@ -371,10 +371,10 @@ public:
inline void glDrawArrays(GLenum mode, GLint first, GLsizei count)
{
this->glDrawArraysInstanced(mode, first, count, 0);
this->glDrawInstancedArrays(mode, first, count, 0);
}
inline void glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
inline void glDrawInstancedArrays(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
{
indexBuffer = 0;
sysmemIndexBuffer = 0;
......
......@@ -908,7 +908,7 @@ void SkeletonNodeT<SkeletonType>::getRenderObjects(IRenderer* _renderer,
ro.vertexDecl = &pointInstanceDecl_;
ro.vertexBuffer = sphere_->getVBO();
ro.glDrawArraysInstanced(GL_TRIANGLES, 0, sphere_->getNumTriangles() * 3, numJoints);
ro.glDrawInstancedArrays(GL_TRIANGLES, 0, sphere_->getNumTriangles() * 3, numJoints);
_renderer->addRenderObject(&ro);
......@@ -1051,7 +1051,7 @@ void SkeletonNodeT<SkeletonType>::getRenderObjects(IRenderer* _renderer,
ro.vertexDecl = &boneInstanceDecl_;
ro.vertexBuffer = cone_->getVBO();
ro.glDrawArraysInstanced(GL_TRIANGLES, 0, cone_->getNumTriangles() * 3, numBones);
ro.glDrawInstancedArrays(GL_TRIANGLES, 0, cone_->getNumTriangles() * 3, numBones);
ro.shaderDesc.vertexTemplateFile = "Skeleton/instanced_wvit_vs.glsl";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment