Merge branch 'bugfixes/schoen/undo-patch' of https://github.com/Unity-Technologies/EditorVR into features/jono/undo-redo-flick

# Conflicts:
#	Scripts/Core/EditorVR.cs

Author: mtschoen-unity

Scripts/Core/EditorVR.cs

@@ -12,6 +12,7 @@
 using UnityEngine.InputNew;
 
 [assembly: OptionalDependency("PolyToolkit.PolyApi", "INCLUDE_POLY_TOOLKIT")]
+[assembly: OptionalDependency("UnityEngine.DrivenRectTransformTracker+BlockUndoCCU", "UNDO_PATCH")]
 
 namespace UnityEditor.Experimental.EditorVR.Core
 {
@@ -127,6 +128,9 @@ static void HandleInitialization()
 
         void Awake()
         {
+#if UNDO_PATCH
+            DrivenRectTransformTracker.BlockUndo = true;
+#endif
             s_Instance = this; // Used only by PreferencesGUI
             Nested.evr = this; // Set this once for the convenience of all nested classes
             m_DefaultTools = defaultTools;
@@ -347,6 +351,10 @@ void OnDestroy()
             {
                 nested.OnDestroy();
             }
+
+#if UNDO_PATCH
+            DrivenRectTransformTracker.BlockUndo = false;
+#endif
         }
 
         void Update()

UndoPatch.meta

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:263509d40ec2fe536344bfaf6e74c421d384466634e67e6b46039f96931a5834
+size 248879