From b8ccbf4092c02466967c34fcc4845b4497edb4d6 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 13 Jul 2014 16:25:03 +0200 Subject: [PATCH] Fixed missing commit Former-commit-id: a46cc95a9f70415f4ebfbb6e12b3a4bf6ba90eb9 --- src/Nazara/Utility/Utility.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp index 639272c79..df38b312c 100644 --- a/src/Nazara/Utility/Utility.cpp +++ b/src/Nazara/Utility/Utility.cpp @@ -140,10 +140,11 @@ unsigned int NzUtility::ComponentCount[nzComponentType_Max+1] = 1, // nzComponentType_Int1 2, // nzComponentType_Int2 3, // nzComponentType_Int3 - 4 // nzComponentType_Int4 + 4, // nzComponentType_Int4 + 4 // nzComponentType_Quaternion }; -static_assert(nzComponentType_Max+1 == 13, "Component count array is incomplete"); +static_assert(nzComponentType_Max+1 == 14, "Component count array is incomplete"); unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] = { @@ -159,9 +160,10 @@ unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] = 1*sizeof(nzUInt32), // nzComponentType_Int1 2*sizeof(nzUInt32), // nzComponentType_Int2 3*sizeof(nzUInt32), // nzComponentType_Int3 - 4*sizeof(nzUInt32) // nzComponentType_Int4 + 4*sizeof(nzUInt32), // nzComponentType_Int4 + 4*sizeof(float) // nzComponentType_Quaternion }; -static_assert(nzComponentType_Max+1 == 13, "Component stride array is incomplete"); +static_assert(nzComponentType_Max+1 == 14, "Component stride array is incomplete"); unsigned int NzUtility::s_moduleReferenceCounter = 0;