Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}
6 changes: 3 additions & 3 deletions RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/Units.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public enum DistanceUnit
Meters,
Centimeters,
Millimeters,
Inches,
Feet
Feet,
Inches
}

public enum PixelUnit
Expand Down Expand Up @@ -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));
}


Expand Down