Merge branch 'master' into vulkan

Former-commit-id: c8f084d159de392aaa6c11354667fe777057a631 [formerly 3ce2308741fdfea19b6564d5ed4bb9e1e36b87cf] Former-commit-id: 43e39f71cd5ae1fd28f02308956361c2a7580e9d
2016-06-03 12:45:28 +02:00
parent b9b5db734c 48a7ba0114
commit c45cb6bb12
5 changed files with 6 additions and 4 deletions
--- a/include/Nazara/Utility/PixelFormat.inl
+++ b/include/Nazara/Utility/PixelFormat.inl
@@ -156,7 +156,7 @@ namespace Nz
 				case PixelFormatType_DXT1:
 				case PixelFormatType_DXT3:
 				case PixelFormatType_DXT5:
-					return (((width + 3) / 4) * ((height + 3) / 4) * (format == PixelFormatType_DXT1) ? 8 : 16) * depth;
+					return (((width + 3) / 4) * ((height + 3) / 4) * ((format == PixelFormatType_DXT1) ? 8 : 16)) * depth;

 				default:
 					NazaraError("Unsupported format");