Merge pull request #546 from Unity-Technologies/staging

0.2.1 staging -> master

Author: mtschoen-unity

Actions/BaseAction.cs

@@ -7,14 +7,16 @@ namespace UnityEditor.Experimental.EditorVR.Actions
     /// </summary>
     abstract class BaseAction : MonoBehaviour, IAction
     {
+#pragma warning disable 649
+        [SerializeField]
+        Sprite m_Icon;
+#pragma warning restore 649
+
         public Sprite icon
         {
             get { return m_Icon; }
         }
 
-        [SerializeField]
-        Sprite m_Icon;
-
         public abstract void ExecuteAction();
     }
 }

Editor/LockableHierarchyGUI.cs

@@ -4,11 +4,13 @@
 [InitializeOnLoad]
 class LockableHierarchyGUI : ScriptableSingleton<LockableHierarchyGUI>
 {
+#pragma warning disable 649
     [SerializeField]
     Texture2D m_LockIcon;
 
     [SerializeField]
     Texture2D m_UnlockIcon;
+#pragma warning restore 649
 
     static LockableHierarchyGUI()
     {

Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat

@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Roboto-Medium SDF Alternate Menu Text
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}

Manipulators/BaseManipulator.cs

@@ -8,10 +8,6 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     class BaseManipulator : MonoBehaviour, IManipulator
     {
-        protected const float k_BaseManipulatorSize = 0.3f;
-        const float k_MinHandleTipDirectionDelta = 0.01f;
-        const float k_LazyFollow = 40f;
-
         class HandleTip
         {
             public Renderer renderer;
@@ -20,6 +16,12 @@ class HandleTip
             public Vector3? positionOffset;
         }
 
+        const float k_MinHandleTipDirectionDelta = 0.01f;
+        const float k_LazyFollow = 40f;
+
+        protected const float k_BaseManipulatorSize = 0.3f;
+
+#pragma warning disable 649
         [SerializeField]
         Renderer m_HandleTip;
 
@@ -40,6 +42,7 @@ class HandleTip
 
         [SerializeField]
         float m_HandleHoverAlpha = 0.8f;
+#pragma warning restore 649
 
         readonly Dictionary<Type, float> m_ScaleBumps = new Dictionary<Type, float>();
         readonly Dictionary<Transform, HandleTip> m_HandleTips = new Dictionary<Transform, HandleTip>();

Manipulators/ScaleManipulator.cs

@@ -5,8 +5,10 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     sealed class ScaleManipulator : BaseManipulator
     {
+#pragma warning disable 649
         [SerializeField]
         BaseHandle m_UniformHandle;
+#pragma warning restore 649
 
         protected override void OnHandleDragging(BaseHandle handle, HandleEventData eventData)
         {

Manipulators/ScaleManipulator.prefab

@@ -429,8 +429,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -443,8 +443,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -457,8 +457,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -471,8 +471,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_SelectionFlags: 3
   m_OrientDragPlaneToRay: 1
   m_Constraints: 0
@@ -485,8 +485,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4dbf941c00473034b89a9acd39176c7f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_HandleTip: {fileID: 23000013012300180}
   m_AllHandles:
   - {fileID: 114000010053947466}

Manipulators/StandardManipulator.cs

@@ -6,6 +6,7 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
 {
     sealed class StandardManipulator : BaseManipulator
     {
+#pragma warning disable 649
         [SerializeField]
         Transform m_PlaneHandlesParent;
 
@@ -17,6 +18,7 @@ sealed class StandardManipulator : BaseManipulator
 
         [SerializeField]
         float m_SphereHandleHideScale = 0.1f;
+#pragma warning restore 649
 
         void Update()
         {

Menus/MainMenu/MainMenu.cs

@@ -18,6 +18,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
         const string k_SettingsMenuSectionName = "Settings";
         const float k_MaxFlickDuration = 0.3f;
 
+#pragma warning disable 649
         [SerializeField]
         ActionMap m_ActionMap;
 
@@ -38,6 +39,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
 
         [SerializeField]
         HapticPulse m_ButtonHoverPulse;
+#pragma warning restore 649
 
         Transform m_AlternateMenuOrigin;
         Transform m_MenuOrigin;

Menus/MainMenu/Scripts/MainMenuButton.cs

@@ -12,8 +12,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus
 {
     sealed class MainMenuButton : MainMenuSelectable, ITooltip, IRayEnterHandler, IRayExitHandler, IPointerClickHandler
     {
+#pragma warning disable 649
         [SerializeField]
         Button m_Button;
+#pragma warning restore 649
 
         CanvasGroup m_CanvasGroup;
 

Menus/MainMenu/Scripts/MainMenuFace.cs

@@ -20,6 +20,7 @@ sealed class MainMenuFace : MonoBehaviour
     {
         static readonly Vector3 k_LocalOffset = Vector3.down * 0.15f;
 
+#pragma warning disable 649
         [SerializeField]
         MeshRenderer m_BorderOutline;
 
@@ -39,6 +40,7 @@ sealed class MainMenuFace : MonoBehaviour
 
         [SerializeField]
         ScrollRect m_ScrollRect;
+#pragma warning restore 649
 
         Material m_BorderOutlineMaterial;
         Vector3 m_BorderOutlineOriginalLocalScale;