lauchmelder/lol
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

i dont even know

Browse source
This commit is contained in:
Lauchmelder 2021-12-27 20:59:54 +01:00
parent 9306dbaae7
commit 052e9f3a40
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/buffers/ElementBuffer.cpp
View file

@ -3,11 +3,7 @@
namespace lol namespace lol
{ {
ElementBuffer::ElementBuffer(const std::vector<unsigned int>& elements, Usage usage) : ElementBuffer::ElementBuffer(const std::vector<unsigned int>& elements, Usage usage) :
<<<<<<< HEAD
Buffer(BufferType::ElementArray), count(elements.size()) Buffer(BufferType::ElementArray), count(elements.size())
=======
Buffer(BufferType::ElementArray), count(count)
>>>>>>> 7b071b2db64f25ad5bfd602c42dd8f17b75e3948
{ {
glBufferData(NATIVE(type), elements.size() * sizeof(unsigned int), elements.data(), NATIVE(usage)); glBufferData(NATIVE(type), elements.size() * sizeof(unsigned int), elements.data(), NATIVE(usage));
} }