Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-08-29 22:41:24 -03:00
23 changed files with 232 additions and 68 deletions
-8
View File
@@ -68,14 +68,6 @@ struct Vertex
unsigned char r, g, b, a;
};
struct Triangle
{
Triangle(const Vertex &x, const Vertex &y, const Vertex &z)
: a(x), b(y), c(z)
{}
Vertex a, b, c;
};
inline int nextP2(int x)
{
x += (x == 0);