Merge remote-tracking branch 'origin/patchRender' into patchRender

4d9d60a3 · Kai Westerkamp · 97c17290 · 2d5d8f0f · 4d9d60a3 · 4d9d60a3
Commit 4d9d60a3 authored Sep 27, 2016 by Kai Westerkamp
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 145 additions and 18 deletions

subdivision.cpp QTProject/subdivision.cpp +144 -18

subdivision.h QTProject/subdivision.h +1 -0

No files found.
--- a/QTProject/subdivision.cpp
+++ b/QTProject/subdivision.cpp
--- a/QTProject/subdivision.h
+++ b/QTProject/subdivision.h
@@ -34,6 +34,7 @@ private:
        QVector<GLuint> vertex_offsets;
        QVector<GLuint> index_buffer;
        QVector<GLuint> patch_index_regular;
+        QVector<GLuint> extra_triangles;
    };

    struct Result