From 304a8445a548c5c36b268a07e38c810620760f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 6 Apr 2012 02:08:31 +0200 Subject: [PATCH] Don't add null pointers for nonexistent mesh primitive data. --- src/Primitives/Cube.cpp | 2 +- src/Primitives/Icosphere.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Primitives/Cube.cpp b/src/Primitives/Cube.cpp index c02887587..a5ba6903a 100644 --- a/src/Primitives/Cube.cpp +++ b/src/Primitives/Cube.cpp @@ -41,6 +41,6 @@ Cube::Cube(): MeshData(Mesh::Primitive::Triangles, new vector{ Vector4( 1.0f, -1.0f, 1.0f), Vector4(-1.0f, 1.0f, 1.0f), Vector4( 1.0f, 1.0f, 1.0f) -}}, {nullptr}, {nullptr}) {} +}}, {}, {}) {} }} diff --git a/src/Primitives/Icosphere.cpp b/src/Primitives/Icosphere.cpp index 99a00cec2..2627ba42b 100644 --- a/src/Primitives/Icosphere.cpp +++ b/src/Primitives/Icosphere.cpp @@ -53,7 +53,7 @@ Icosphere<0>::Icosphere(): MeshData(Mesh::Primitive::Triangles, new vectorassign(normals(0)->begin(), normals(0)->end()); }