sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into NDK

Browse Source 
Conflicts:
	include/Nazara/Core/Algorithm.inl
	include/Nazara/Core/ByteArray.hpp
	include/Nazara/Math/Algorithm.inl
	src/Nazara/Graphics/SkyboxBackground.cpp

Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566
This commit is contained in:
Lynix
2015-08-21 18:55:58 +02:00
parent dea48a289d 4176f1e019
commit 505f1dbb03
76 changed files with 2358 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Math/BoundingVolume.inl
View File

@@ -212,7 +212,10 @@ template<typename T>
bool NzBoundingVolume<T>::operator==(const NzBoundingVolume& volume) const
{
if (extend == volume.extend)
return obb == volume.obb;
if (extend == nzExtend_Finite)
return obb == volume.obb;
else
return true;
else
return false;
}