Fix for Feet and inches are the wrong way around #336 (#341)

LogicalError · web-flow · commit dd58bc813965 · 2022-03-07T10:13:41.000+01:00
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs
@@ -2,7 +2,7 @@ namespace RealtimeCSG.Foundation
 {
     internal static class Versioning
     {
-        public const string PluginVersion       = "1_569";
+        public const string PluginVersion       = "1_570";
         public const string PluginDLLVersion    = "1_559";
     }
 }
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/Units.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/Units.cs
@@ -12,8 +12,8 @@ public enum DistanceUnit
 		Meters,
 		Centimeters,
 		Millimeters,
-		Inches,
-		Feet
+		Feet,
+		Inches
 	}
 
 	public enum PixelUnit
@@ -67,7 +67,7 @@ public static DistanceUnit	CycleToNextUnit		(DistanceUnit unit)
 		{
 			if (unit < DistanceUnit.Meters)
 				return DistanceUnit.Meters;
-			return (DistanceUnit)((int)(unit + 1) % (((int)DistanceUnit.Feet) + 1));
+			return (DistanceUnit)((int)(unit + 1) % (((int)DistanceUnit.Inches) + 1));
 		}
 
 		

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace RealtimeCSG.Foundation`
`2`	`2`	`{`
`3`	`3`	`internal static class Versioning`
`4`	`4`	`{`
`5`		`- public const string PluginVersion = "1_569";`
	`5`	`+ public const string PluginVersion = "1_570";`
`6`	`6`	`public const string PluginDLLVersion = "1_559";`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public enum DistanceUnit`
`12`	`12`	`Meters,`
`13`	`13`	`Centimeters,`
`14`	`14`	`Millimeters,`
`15`		`- Inches,`
`16`		`- Feet`
	`15`	`+ Feet,`
	`16`	`+ Inches`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public enum PixelUnit`
`@@ -67,7 +67,7 @@ public static DistanceUnit CycleToNextUnit (DistanceUnit unit)`
`67`	`67`	`{`
`68`	`68`	`if (unit < DistanceUnit.Meters)`
`69`	`69`	`return DistanceUnit.Meters;`
`70`		`- return (DistanceUnit)((int)(unit + 1) % (((int)DistanceUnit.Feet) + 1));`
	`70`	`+ return (DistanceUnit)((int)(unit + 1) % (((int)DistanceUnit.Inches) + 1));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`