Merge branch 'master' into NDK

Conflicts:
	src/Nazara/Physics/Geom.cpp

Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4

include/Nazara/Core/GuillotineBinPack.hpp

@@ -18,25 +18,8 @@
 class NAZARA_API NzGuillotineBinPack
 {
 	public:
-		enum FreeRectChoiceHeuristic
-		{
-			RectBestAreaFit,
-			RectBestLongSideFit,
-			RectBestShortSideFit,
-			RectWorstAreaFit,
-			RectWorstLongSideFit,
-			RectWorstShortSideFit
-		};
-
-		enum GuillotineSplitHeuristic
-		{
-			SplitLongerAxis,
-			SplitLongerLeftoverAxis,
-			SplitMaximizeArea,
-			SplitMinimizeArea,
-			SplitShorterAxis,
-			SplitShorterLeftoverAxis
-		};
+		enum FreeRectChoiceHeuristic : int;
+		enum GuillotineSplitHeuristic : int;
 
 		NzGuillotineBinPack();
 		NzGuillotineBinPack(unsigned int width, unsigned int height);
@@ -70,6 +53,26 @@ class NAZARA_API NzGuillotineBinPack
 		NzGuillotineBinPack& operator=(const NzGuillotineBinPack&) = default;
 		NzGuillotineBinPack& operator=(NzGuillotineBinPack&&) = default;
 
+		enum FreeRectChoiceHeuristic : int
+		{
+			RectBestAreaFit,
+			RectBestLongSideFit,
+			RectBestShortSideFit,
+			RectWorstAreaFit,
+			RectWorstLongSideFit,
+			RectWorstShortSideFit
+		};
+
+		enum GuillotineSplitHeuristic : int
+		{
+			SplitLongerAxis,
+			SplitLongerLeftoverAxis,
+			SplitMaximizeArea,
+			SplitMinimizeArea,
+			SplitShorterAxis,
+			SplitShorterLeftoverAxis
+		};
+
 	private:
 		void SplitFreeRectAlongAxis(const NzRectui& freeRect, const NzRectui& placedRect, bool splitHorizontal);
 		void SplitFreeRectByHeuristic(const NzRectui& freeRect, const NzRectui& placedRect, GuillotineSplitHeuristic method);