Merge pull request #10039 from Zee2/enableRegressionFix

Zee2 · web-flow · commit fae0401a35db · 2021-06-28T15:34:07.000-07:00
Fixing BC OnEnable issue when non-default activation type specified in-editor
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs
@@ -736,8 +736,9 @@ private static T EnsureScriptable<T>(T instance) where T : ScriptableObject
 
         private void OnEnable()
         {
-            CreateRig();
+            DetermineTargetBounds();
             SetActivationFlags();
+            CreateRig();
             CaptureInitialState();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -736,8 +736,9 @@ private static T EnsureScriptable<T>(T instance) where T : ScriptableObject`
`736`	`736`
`737`	`737`	`private void OnEnable()`
`738`	`738`	`{`
`739`		`- CreateRig();`
	`739`	`+ DetermineTargetBounds();`
`740`	`740`	`SetActivationFlags();`
	`741`	`+ CreateRig();`
`741`	`742`	`CaptureInitialState();`
`742`	`743`	`}`
`743`	`744`