Merge branch 'main' of github.com:/NCCA/NGL

NCCA · Mar 29, 2024 · 5093085 · 5093085
2 parents 2894772 + b2fc242
commit 5093085
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/ngl/Vec2.h b/include/ngl/Vec2.h
@@ -242,10 +242,9 @@ class NGL_DLLEXPORT Vec2
   /// anonymous unions public whereas clang++ complains see this post
   /// http://jonmacey.blogspot.com/2011/03/anonymous-union-struct-weirdness.html
     public:
-#pragma pack(push, 1)
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
+#pragma pack(push, 1)
   union
   {
     struct

diff --git a/src/SimpleIndexVAO.cpp b/src/SimpleIndexVAO.cpp
@@ -45,6 +45,8 @@ void SimpleIndexVAO::setData(const AbstractVAO::VertexData &_data)
   if(m_allocated)
   {
     glDeleteBuffers(1, &m_buffer);
+    glDeleteBuffers(1, &m_idxBuffer);
+
   }
 
   glGenBuffers(1, &m_buffer);