Merge pull request #10274 from keveleigh/enumvalueindex

keveleigh · keveleigh · commit 8769d615032d · 2021-11-04T18:13:04.000-07:00
Convert incorrect usages of enumValueIndex to intValue
diff --git a/Assets/MRTK/Core/Inspectors/ControllerPopupWindow.cs b/Assets/MRTK/Core/Inspectors/ControllerPopupWindow.cs
@@ -502,7 +502,7 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC
                         {
                             var inputAction = actionId.intValue == 0 ? MixedRealityInputAction.None : MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];
                             actionDescription.stringValue = inputAction.Description;
-                            actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;
+                            actionConstraint.intValue = (int)inputAction.AxisConstraint;
                         }
 
                         if ((AxisType)axisType.intValue == AxisType.Digital)
@@ -730,7 +730,7 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC
                                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];
                             actionId.intValue = (int)inputAction.Id;
                             actionDescription.stringValue = inputAction.Description;
-                            actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;
+                            actionConstraint.intValue = (int)inputAction.AxisConstraint;
                             interactionList.serializedObject.ApplyModifiedProperties();
                         }
                     }
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs
@@ -224,7 +224,7 @@ private void RenderList(SerializedProperty list)
                                 }
 
                                 actionDescription.stringValue = inputAction.Description;
-                                actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;
+                                actionConstraint.intValue = (int)inputAction.AxisConstraint;
                                 serializedObject.ApplyModifiedProperties();
                             }
 
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/MixedRealitySpeechCommandsProfileInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/MixedRealitySpeechCommandsProfileInspector.cs
@@ -166,7 +166,7 @@ private void RenderList(SerializedProperty list)
                             {
                                 MixedRealityInputAction inputAction = actionId.intValue == 0 ? MixedRealityInputAction.None : MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];
                                 actionDescription.stringValue = inputAction.Description;
-                                actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;
+                                actionConstraint.intValue = (int)inputAction.AxisConstraint;
                             }
                         }
                         EditorGUILayout.Space();
diff --git a/Assets/MRTK/Core/Inspectors/Utilities/InspectorFieldsUtility.cs b/Assets/MRTK/Core/Inspectors/Utilities/InspectorFieldsUtility.cs
@@ -89,7 +89,7 @@ public static void AddFieldsToSettingsList(SerializedProperty settings, List<Ins
                 SerializedProperty options = settingItem.FindPropertyRelative("Options");
                 SerializedProperty name = settingItem.FindPropertyRelative("Name");
 
-                type.enumValueIndex = (int)data[i].Attributes.Type;
+                type.intValue = (int)data[i].Attributes.Type;
                 tooltip.stringValue = data[i].Attributes.Tooltip;
                 label.stringValue = data[i].Attributes.Label;
                 name.stringValue = data[i].Name;
diff --git a/Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs b/Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs
@@ -535,7 +535,7 @@ public static Enum DrawEnumSerializedProperty(Rect position, SerializedProperty
             EditorGUI.BeginProperty(position, label, prop);
             {
                 result = EditorGUI.EnumPopup(position, label, propValue);
-                prop.enumValueIndex = Convert.ToInt32(result);
+                prop.intValue = Convert.ToInt32(result);
             }
             EditorGUI.EndProperty();
 
diff --git a/Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionDeviceManagerProfileInspector.cs b/Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionDeviceManagerProfileInspector.cs
@@ -102,14 +102,14 @@ public virtual void RenderCustomInspector()
                         // Allow selection of the LeapVRDeviceOffsetMode if the LeapControllerOrientation is Headset
                         EditorGUILayout.PropertyField(leapVRDeviceOffsetMode);
 
-                        if (leapVRDeviceOffsetMode.enumValueIndex == (int)LeapVRDeviceOffsetMode.ManualHeadOffset)
+                        if (leapVRDeviceOffsetMode.intValue == (int)LeapVRDeviceOffsetMode.ManualHeadOffset)
                         {
                             // Display the properties for editing the head offset 
                             EditorGUILayout.PropertyField(leapVRDeviceOffsetY);
                             EditorGUILayout.PropertyField(leapVRDeviceOffsetZ);
                             EditorGUILayout.PropertyField(leapVRDeviceOffsetTiltX);
                         }
-                        else if (leapVRDeviceOffsetMode.enumValueIndex == (int)LeapVRDeviceOffsetMode.Transform)
+                        else if (leapVRDeviceOffsetMode.intValue == (int)LeapVRDeviceOffsetMode.Transform)
                         {
                             // Display the transform property 
                             // EditorGUILayout.PropertyField() did not allow the setting the transform property in editor 
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Exp/InteractiveEl/CompressableButtonInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Exp/InteractiveEl/CompressableButtonInspector.cs
@@ -329,7 +329,7 @@ public override void OnInspectorGUI()
             {
                 // Changing the DistanceSpaceMode requires updating the plane distance values so they stay in the same relative ratio positions
                 Undo.RecordObject(target, string.Concat("Trigger Plane Distance Conversion of ", button.name));
-                button.DistanceSpaceMode = (CompressableButton.SpaceMode)distanceSpaceMode.enumValueIndex;
+                button.DistanceSpaceMode = (CompressableButton.SpaceMode)distanceSpaceMode.intValue;
                 serializedObject.Update();
             }
 
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Input/Handlers/ControllerPoseSynchronizerInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Input/Handlers/ControllerPoseSynchronizerInspector.cs
@@ -62,9 +62,9 @@ public override void OnInspectorGUI()
                     var label = new GUIContent(handedness.displayName);
                     using (new EditorGUI.PropertyScope(position, label, handedness))
                     {
-                        var currentHandedness = (Handedness)handedness.enumValueIndex;
+                        var currentHandedness = (Handedness)handedness.intValue;
 
-                        handedness.enumValueIndex = (int)(Handedness)EditorGUI.EnumPopup(position, label, currentHandedness,
+                        handedness.intValue = (int)(Handedness)EditorGUI.EnumPopup(position, label, currentHandedness,
                             (value) => { return (Handedness)value == Handedness.Left || (Handedness)value == Handedness.Right; });
                     }
                 }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/Collections/GridObjectCollectionInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/Collections/GridObjectCollectionInspector.cs
@@ -52,7 +52,7 @@ protected override void OnInspectorGUIInsertion()
 
 
 
-            LayoutOrder layoutTypeIndex = (LayoutOrder)layout.enumValueIndex;
+            LayoutOrder layoutTypeIndex = (LayoutOrder)layout.intValue;
             if (layoutTypeIndex == LayoutOrder.ColumnThenRow)
             {
                 EditorGUILayout.HelpBox("ColumnThenRow will lay out content first horizontally (by column), then vertically (by row). NumColumns specifies number of columns per row.", MessageType.Info);
@@ -79,7 +79,7 @@ protected override void OnInspectorGUIInsertion()
                 EditorGUILayout.PropertyField(cellHeight);
             }
 
-            ObjectOrientationSurfaceType surfaceTypeIndex = (ObjectOrientationSurfaceType)surfaceType.enumValueIndex;
+            ObjectOrientationSurfaceType surfaceTypeIndex = (ObjectOrientationSurfaceType)surfaceType.intValue;
             if (surfaceTypeIndex == ObjectOrientationSurfaceType.Plane)
             {
                 EditorGUILayout.PropertyField(distance, new GUIContent("Distance from parent", "Distance from parent object's origin"));
@@ -96,8 +96,7 @@ protected override void OnInspectorGUIInsertion()
                 EditorGUILayout.PropertyField(anchor);
             }
 
-            LayoutAnchor layoutAnchor = (LayoutAnchor)anchor.enumValueIndex;
-            if (layoutAnchor != LayoutAnchor.MiddleCenter)
+            if ((LayoutAnchor)anchor.intValue != LayoutAnchor.MiddleCenter)
             {
                 EditorGUILayout.PropertyField(anchorAlongAxis);
             }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/ButtonConfigHelperInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/ButtonConfigHelperInspector.cs
@@ -107,7 +107,7 @@ public override void OnInspectorGUI()
 
             showComponents = EditorGUILayout.Toggle("Show Component References", showComponents);
 
-            ButtonIconStyle oldStyle = (ButtonIconStyle)iconStyleProp.enumValueIndex;
+            ButtonIconStyle oldStyle = (ButtonIconStyle)iconStyleProp.intValue;
 
             using (new EditorGUI.IndentLevelScope(1))
             {
@@ -288,7 +288,7 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
 
-            if (oldStyle != (ButtonIconStyle)iconStyleProp.enumValueIndex)
+            if (oldStyle != (ButtonIconStyle)iconStyleProp.intValue)
             {
                 cb.ForceRefresh();
             }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/PressableButtonInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/PressableButtonInspector.cs
@@ -331,7 +331,7 @@ public override void OnInspectorGUI()
             {
                 // Changing the DistanceSpaceMode requires updating the plane distance values so they stay in the same relative ratio positions
                 Undo.RecordObject(target, string.Concat("Trigger Plane Distance Conversion of ", button.name));
-                button.DistanceSpaceMode = (PressableButton.SpaceMode)distanceSpaceMode.enumValueIndex;
+                button.DistanceSpaceMode = (PressableButton.SpaceMode)distanceSpaceMode.intValue;
                 serializedObject.Update();
             }
 
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/Tooltips/ToolTipConnectorInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/Tooltips/ToolTipConnectorInspector.cs
@@ -146,7 +146,7 @@ public override void OnInspectorGUI()
                                         break;
                                 }
                                 ConnectorPivotDirection newPivotDirection = DrawPivotDirection(connector.PivotDirection);
-                                pivotDirection.enumValueIndex = (int)newPivotDirection;
+                                pivotDirection.intValue = (int)newPivotDirection;
                                 switch (connector.PivotDirection)
                                 {
                                     case ConnectorPivotDirection.Manual:
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/VisualThemes/ThemeInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/VisualThemes/ThemeInspector.cs
@@ -270,7 +270,7 @@ private static void RenderShaderProperties(SerializedProperty themeDefinition)
                 SerializedProperty stateProperty = stateProperties.GetArrayElementAtIndex(i);
                 SerializedProperty type = stateProperty.FindPropertyRelative("type");
 
-                if (ThemeStateProperty.IsShaderPropertyType((ThemePropertyTypes)type.enumValueIndex))
+                if (ThemeStateProperty.IsShaderPropertyType((ThemePropertyTypes)type.intValue))
                 {
                     SerializedProperty statePropertyName = stateProperty.FindPropertyRelative("name");
                     SerializedProperty shader = stateProperty.FindPropertyRelative("targetShader");
@@ -281,7 +281,7 @@ private static void RenderShaderProperties(SerializedProperty themeDefinition)
 
                     EditorGUILayout.PropertyField(shader, new GUIContent(statePropertyName.stringValue + " Shader"), false);
 
-                    var propertyList = GetShaderPropertyList(shader.objectReferenceValue as Shader, GetShaderPropertyFilter((ThemePropertyTypes)type.enumValueIndex));
+                    var propertyList = GetShaderPropertyList(shader.objectReferenceValue as Shader, GetShaderPropertyFilter((ThemePropertyTypes)type.intValue));
                     int selectedIndex = propertyList.IndexOf(shaderPropertyname.stringValue);
 
                     Rect pos = EditorGUILayout.GetControlRect();
@@ -326,11 +326,11 @@ private static void MigrateShaderData(SerializedProperty stateProperty, Serializ
                     shader.objectReferenceValue = StandardShaderUtility.MrtkStandardShader;
 
                     SerializedProperty type = stateProperty.FindPropertyRelative("type");
-                    if (type.enumValueIndex == (int)ThemePropertyTypes.Color)
+                    if (type.intValue == (int)ThemePropertyTypes.Color)
                     {
                         shaderPropertyname.stringValue = "_Color";
                     }
-                    else if (type.enumValueIndex == (int)ThemePropertyTypes.Texture)
+                    else if (type.intValue == (int)ThemePropertyTypes.Texture)
                     {
                         shaderPropertyname.stringValue = "_MainTex";
                     }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/FollowInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/FollowInspector.cs
@@ -142,7 +142,7 @@ public override void OnInspectorGUI()
 
                     EditorGUILayout.PropertyField(angularClampMode);
 
-                    switch ((Follow.AngularClampType)angularClampMode.enumValueIndex)
+                    switch ((Follow.AngularClampType)angularClampMode.intValue)
                     {
                         case Follow.AngularClampType.AngleStepping:
                             {
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/InBetweenInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/InBetweenInspector.cs
@@ -34,19 +34,13 @@ public override void OnInspectorGUI()
 
             serializedObject.Update();
 
-            bool objectChanged = false;
-
-            EditorGUI.BeginChangeCheck();
-
             InspectorUIUtility.DrawEnumSerializedProperty(secondTrackedTargetTypeProperty, SecondTrackedTypeLabel, solverInBetween.SecondTrackedObjectType);
 
-            if (secondTrackedTargetTypeProperty.enumValueIndex == (int)TrackedObjectType.CustomOverride)
+            if (secondTrackedTargetTypeProperty.intValue == (int)TrackedObjectType.CustomOverride)
             {
                 EditorGUILayout.PropertyField(secondTransformOverrideProperty);
             }
 
-            objectChanged = EditorGUI.EndChangeCheck();
-
             EditorGUILayout.PropertyField(partwayOffsetProperty);
 
             serializedObject.ApplyModifiedProperties();
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/SolverHandlerInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/SolverHandlerInspector.cs
@@ -58,21 +58,21 @@ public override void OnInspectorGUI()
                     + "\" is obsolete. Select MotionController or HandJoint values instead");
             }
 
-            if (trackedTargetProperty.enumValueIndex == (int)TrackedObjectType.HandJoint ||
-                trackedTargetProperty.enumValueIndex == (int)TrackedObjectType.ControllerRay)
+            if (trackedTargetProperty.intValue == (int)TrackedObjectType.HandJoint ||
+                trackedTargetProperty.intValue == (int)TrackedObjectType.ControllerRay)
             {
                 EditorGUILayout.PropertyField(trackedHandnessProperty);
-                if (trackedHandnessProperty.enumValueIndex > (int)Handedness.Both)
+                if (trackedHandnessProperty.intValue > (int)Handedness.Both)
                 {
                     InspectorUIUtility.DrawWarning("Only Handedness values of None, Left, Right, and Both are valid");
                 }
             }
 
-            if (trackedTargetProperty.enumValueIndex == (int)TrackedObjectType.HandJoint)
+            if (trackedTargetProperty.intValue == (int)TrackedObjectType.HandJoint)
             {
                 EditorGUILayout.PropertyField(trackedHandJointProperty);
             }
-            else if (trackedTargetProperty.enumValueIndex == (int)TrackedObjectType.CustomOverride)
+            else if (trackedTargetProperty.intValue == (int)TrackedObjectType.CustomOverride)
             {
                 EditorGUILayout.PropertyField(transformOverrideProperty);
             }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/SurfaceMagnetismInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/Utilities/Solvers/SurfaceMagnetismInspector.cs
@@ -105,7 +105,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(raycastModeProperty);
 
             // Draw properties dependent on type of raycast direction mode selected
-            switch (raycastModeProperty.enumValueIndex)
+            switch (raycastModeProperty.intValue)
             {
                 case (int)SceneQueryType.BoxRaycast:
                     EditorGUILayout.PropertyField(boxRaysPerEdgeProperty);
@@ -120,8 +120,8 @@ public override void OnInspectorGUI()
                     break;
             }
 
-            if (raycastModeProperty.enumValueIndex != (int)SceneQueryType.SimpleRaycast &&
-                raycastModeProperty.enumValueIndex != (int)SceneQueryType.SphereOverlap)
+            if (raycastModeProperty.intValue != (int)SceneQueryType.SimpleRaycast &&
+                raycastModeProperty.intValue != (int)SceneQueryType.SphereOverlap)
             {
                 EditorGUILayout.PropertyField(volumeCastSizeOverrideProperty);
             }
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Buttons/ButtonConfigHelper.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Buttons/ButtonConfigHelper.cs
@@ -494,7 +494,7 @@ public void EditorUpgradeCustomIcon(ButtonIconSet defaultIconSet = null, string
 
             if (!iconQuadRenderer.gameObject.activeSelf && !iconSpriteRenderer.gameObject.activeSelf && !iconCharLabel.gameObject.activeSelf)
             {   // If all the icon objects are disabled, set the icon style to none and do nothing else.
-                iconStyleProp.enumValueIndex = (int)ButtonIconStyle.None;
+                iconStyleProp.intValue = (int)ButtonIconStyle.None;
                 configObject.ApplyModifiedProperties();
                 EditorUtility.SetDirty(gameObject);
                 return;

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC`
`502`	`502`	`{`
`503`	`503`	`var inputAction = actionId.intValue == 0 ? MixedRealityInputAction.None : MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];`
`504`	`504`	`actionDescription.stringValue = inputAction.Description;`
`505`		`- actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;`
	`505`	`+ actionConstraint.intValue = (int)inputAction.AxisConstraint;`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`if ((AxisType)axisType.intValue == AxisType.Digital)`
`@@ -730,7 +730,7 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC`
`730`	`730`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];`
`731`	`731`	`actionId.intValue = (int)inputAction.Id;`
`732`	`732`	`actionDescription.stringValue = inputAction.Description;`
`733`		`- actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;`
	`733`	`+ actionConstraint.intValue = (int)inputAction.AxisConstraint;`
`734`	`734`	`interactionList.serializedObject.ApplyModifiedProperties();`
`735`	`735`	`}`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private void RenderList(SerializedProperty list)`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`actionDescription.stringValue = inputAction.Description;`
`227`		`- actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;`
	`227`	`+ actionConstraint.intValue = (int)inputAction.AxisConstraint;`
`228`	`228`	`serializedObject.ApplyModifiedProperties();`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private void RenderList(SerializedProperty list)`
`166`	`166`	`{`
`167`	`167`	`MixedRealityInputAction inputAction = actionId.intValue == 0 ? MixedRealityInputAction.None : MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];`
`168`	`168`	`actionDescription.stringValue = inputAction.Description;`
`169`		`- actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;`
	`169`	`+ actionConstraint.intValue = (int)inputAction.AxisConstraint;`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`EditorGUILayout.Space();`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public static Enum DrawEnumSerializedProperty(Rect position, SerializedProperty`
`535`	`535`	`EditorGUI.BeginProperty(position, label, prop);`
`536`	`536`	`{`
`537`	`537`	`result = EditorGUI.EnumPopup(position, label, propValue);`
`538`		`- prop.enumValueIndex = Convert.ToInt32(result);`
	`538`	`+ prop.intValue = Convert.ToInt32(result);`
`539`	`539`	`}`
`540`	`540`	`EditorGUI.EndProperty();`
`541`	`541`
Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,14 @@ public virtual void RenderCustomInspector()`
`102`	`102`	`// Allow selection of the LeapVRDeviceOffsetMode if the LeapControllerOrientation is Headset`
`103`	`103`	`EditorGUILayout.PropertyField(leapVRDeviceOffsetMode);`
`104`	`104`
`105`		`- if (leapVRDeviceOffsetMode.enumValueIndex == (int)LeapVRDeviceOffsetMode.ManualHeadOffset)`
	`105`	`+ if (leapVRDeviceOffsetMode.intValue == (int)LeapVRDeviceOffsetMode.ManualHeadOffset)`
`106`	`106`	`{`
`107`	`107`	`// Display the properties for editing the head offset`
`108`	`108`	`EditorGUILayout.PropertyField(leapVRDeviceOffsetY);`
`109`	`109`	`EditorGUILayout.PropertyField(leapVRDeviceOffsetZ);`
`110`	`110`	`EditorGUILayout.PropertyField(leapVRDeviceOffsetTiltX);`
`111`	`111`	`}`
`112`		`- else if (leapVRDeviceOffsetMode.enumValueIndex == (int)LeapVRDeviceOffsetMode.Transform)`
	`112`	`+ else if (leapVRDeviceOffsetMode.intValue == (int)LeapVRDeviceOffsetMode.Transform)`
`113`	`113`	`{`
`114`	`114`	`// Display the transform property`
`115`	`115`	`// EditorGUILayout.PropertyField() did not allow the setting the transform property in editor`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ public override void OnInspectorGUI()`
`329`	`329`	`{`
`330`	`330`	`// Changing the DistanceSpaceMode requires updating the plane distance values so they stay in the same relative ratio positions`
`331`	`331`	`Undo.RecordObject(target, string.Concat("Trigger Plane Distance Conversion of ", button.name));`
`332`		`- button.DistanceSpaceMode = (CompressableButton.SpaceMode)distanceSpaceMode.enumValueIndex;`
	`332`	`+ button.DistanceSpaceMode = (CompressableButton.SpaceMode)distanceSpaceMode.intValue;`
`333`	`333`	`serializedObject.Update();`
`334`	`334`	`}`
`335`	`335`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ public override void OnInspectorGUI()`
`62`	`62`	`var label = new GUIContent(handedness.displayName);`
`63`	`63`	`using (new EditorGUI.PropertyScope(position, label, handedness))`
`64`	`64`	`{`
`65`		`- var currentHandedness = (Handedness)handedness.enumValueIndex;`
	`65`	`+ var currentHandedness = (Handedness)handedness.intValue;`
`66`	`66`
`67`		`- handedness.enumValueIndex = (int)(Handedness)EditorGUI.EnumPopup(position, label, currentHandedness,`
	`67`	`+ handedness.intValue = (int)(Handedness)EditorGUI.EnumPopup(position, label, currentHandedness,`
`68`	`68`	`(value) => { return (Handedness)value == Handedness.Left \|\| (Handedness)value == Handedness.Right; });`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protected override void OnInspectorGUIInsertion()`
`52`	`52`
`53`	`53`
`54`	`54`
`55`		`- LayoutOrder layoutTypeIndex = (LayoutOrder)layout.enumValueIndex;`
	`55`	`+ LayoutOrder layoutTypeIndex = (LayoutOrder)layout.intValue;`
`56`	`56`	`if (layoutTypeIndex == LayoutOrder.ColumnThenRow)`
`57`	`57`	`{`
`58`	`58`	`EditorGUILayout.HelpBox("ColumnThenRow will lay out content first horizontally (by column), then vertically (by row). NumColumns specifies number of columns per row.", MessageType.Info);`
`@@ -79,7 +79,7 @@ protected override void OnInspectorGUIInsertion()`
`79`	`79`	`EditorGUILayout.PropertyField(cellHeight);`
`80`	`80`	`}`
`81`	`81`
`82`		`- ObjectOrientationSurfaceType surfaceTypeIndex = (ObjectOrientationSurfaceType)surfaceType.enumValueIndex;`
	`82`	`+ ObjectOrientationSurfaceType surfaceTypeIndex = (ObjectOrientationSurfaceType)surfaceType.intValue;`
`83`	`83`	`if (surfaceTypeIndex == ObjectOrientationSurfaceType.Plane)`
`84`	`84`	`{`
`85`	`85`	`EditorGUILayout.PropertyField(distance, new GUIContent("Distance from parent", "Distance from parent object's origin"));`
`@@ -96,8 +96,7 @@ protected override void OnInspectorGUIInsertion()`
`96`	`96`	`EditorGUILayout.PropertyField(anchor);`
`97`	`97`	`}`
`98`	`98`
`99`		`- LayoutAnchor layoutAnchor = (LayoutAnchor)anchor.enumValueIndex;`
`100`		`- if (layoutAnchor != LayoutAnchor.MiddleCenter)`
	`99`	`+ if ((LayoutAnchor)anchor.intValue != LayoutAnchor.MiddleCenter)`
`101`	`100`	`{`
`102`	`101`	`EditorGUILayout.PropertyField(anchorAlongAxis);`
`103`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public override void OnInspectorGUI()`
`107`	`107`
`108`	`108`	`showComponents = EditorGUILayout.Toggle("Show Component References", showComponents);`
`109`	`109`
`110`		`- ButtonIconStyle oldStyle = (ButtonIconStyle)iconStyleProp.enumValueIndex;`
	`110`	`+ ButtonIconStyle oldStyle = (ButtonIconStyle)iconStyleProp.intValue;`
`111`	`111`
`112`	`112`	`using (new EditorGUI.IndentLevelScope(1))`
`113`	`113`	`{`
`@@ -288,7 +288,7 @@ public override void OnInspectorGUI()`
`288`	`288`
`289`	`289`	`serializedObject.ApplyModifiedProperties();`
`290`	`290`
`291`		`- if (oldStyle != (ButtonIconStyle)iconStyleProp.enumValueIndex)`
	`291`	`+ if (oldStyle != (ButtonIconStyle)iconStyleProp.intValue)`
`292`	`292`	`{`
`293`	`293`	`cb.ForceRefresh();`
`294`	`294`	`}`