Merge branch 'fix_define' into 'master'

Fixed glew and renderobject define collision



See merge request !102

ACG/GL/RenderObject.hh

@@ -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;

ObjectTypes/Skeleton/SkeletonNodeT.cc

@@ -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";