Merge pull request #1751 from thestonefox/refactor/enum-mask-deprecation

refactor(PolicyList): provide alternative for deprecated EnumMaskField

Author: thestonefox

Assets/VRTK/Source/Editor/VRTK_PolicyListEditor.cs

@@ -1,32 +1,40 @@
 namespace VRTK
 {
-    using UnityEngine;
     using UnityEditor;
+    using System;
 
     [CustomEditor(typeof(VRTK_PolicyList))]
     public class VRTK_PolicyListEditor : Editor
     {
         SerializedProperty staticFlagMask;
         SerializedProperty identifiers;
 
-        private void OnEnable()
-        {
-            staticFlagMask = serializedObject.FindProperty("checkType");
-            identifiers = serializedObject.FindProperty("identifiers");
-        }
-
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
-
             EditorGUILayout.PropertyField(serializedObject.FindProperty("operation"));
-            staticFlagMask.intValue = (int)((VRTK_PolicyList.CheckTypes)EditorGUILayout.EnumMaskField("Check Types", (VRTK_PolicyList.CheckTypes)staticFlagMask.intValue));
+            staticFlagMask.intValue = (int)((VRTK_PolicyList.CheckTypes)EnumField("Check Types", (VRTK_PolicyList.CheckTypes)staticFlagMask.intValue));
             ArrayGUI(identifiers);
 
             serializedObject.ApplyModifiedProperties();
         }
 
-        void ArrayGUI(SerializedProperty property)
+        private void OnEnable()
+        {
+            staticFlagMask = serializedObject.FindProperty("checkType");
+            identifiers = serializedObject.FindProperty("identifiers");
+        }
+
+        private Enum EnumField(string label, Enum enumValue)
+        {
+#if UNITY_2017_3_OR_NEWER
+            return EditorGUILayout.EnumFlagsField(label, enumValue);
+#else
+            return EditorGUILayout.EnumMaskField(label, enumValue);
+#endif
+        }
+
+        private void ArrayGUI(SerializedProperty property)
         {
             SerializedProperty arraySizeProp = property.FindPropertyRelative("Array.size");
             EditorGUILayout.PropertyField(arraySizeProp);

Assets/VRTK/Source/Editor/VRTK_SDKManagerEditor.cs

@@ -6,7 +6,6 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
 
     [CustomEditor(typeof(VRTK_SDKManager))]
     public class VRTK_SDKManagerEditor : Editor