Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping

Former-commit-id: 0c302477d672346eb50c12f8fa7e2b6a19d60779
2015-06-23 12:11:02 +02:00
parent 685f8c99da 53c671bc6a
commit b7b5458c79
3 changed files with 11 additions and 5 deletions
--- a/include/Nazara/Core/Bitset.inl
+++ b/include/Nazara/Core/Bitset.inl
@@ -104,7 +104,8 @@ unsigned int NzBitset<Block, Allocator>::FindNext(unsigned int bit) const
 {
 	NazaraAssert(bit < m_bitCount, "Bit index out of range");

-	bit++;
+	if (++bit >= m_bitCount)
+		return npos;

 	// Le bloc du bit, l'indice du bit
 	unsigned int blockIndex = GetBlockIndex(bit);