FIX: RegisterLayoutOverride causing 'extend' setting to be lost (case 1377719, #1452).

Author: Rene Damm

Assets/Tests/InputSystem/CoreTests_Layouts.cs

@@ -972,6 +972,49 @@ public void Layouts_CanApplyOverridesToOverrides()
         Assert.That(device["extraControl"].layout, Is.EqualTo("Axis"));
     }
 
+    // https://fogbugz.unity3d.com/f/cases/1377719/
+    [Test]
+    [Category("Layouts")]
+    public void Layouts_ApplyingOverride_DoesNotAlterExistingInheritanceHierarchy()
+    {
+        const string baseLayout = @"
+            {
+                ""name"" : ""BaseLayout"",
+                ""controls"" : [
+                    { ""name"" : ""button1"", ""layout"" : ""Button"" }
+                ]
+            }
+        ";
+        const string derivedLayout = @"
+            {
+                ""name"" : ""DerivedLayout"",
+                ""extend"" : ""BaseLayout"",
+                ""controls"" : [
+                    { ""name"" : ""button2"", ""layout"" : ""Button"" }
+                ]
+            }
+        ";
+        const string derivedLayoutOverride = @"
+            {
+                ""name"" : ""DerivedLayoutOverride"",
+                ""extend"" : ""DerivedLayout"",
+                ""controls"" : [
+                    { ""name"" : ""button3"", ""layout"" : ""Button"" }
+                ]
+            }
+        ";
+
+        InputSystem.RegisterLayout(baseLayout);
+        InputSystem.RegisterLayout(derivedLayout);
+        InputSystem.RegisterLayoutOverride(derivedLayoutOverride);
+
+        var layout = InputSystem.LoadLayout("DerivedLayout");
+        Assert.That(layout.baseLayouts, Is.EquivalentTo(new[] { new InternedString("BaseLayout") }));
+
+        var device = InputSystem.AddDevice("DerivedLayout");
+        Assert.That(new[] { 1, 2, 3 }.Select(i => device["button" + i]), Is.All.TypeOf<ButtonControl>());
+    }
+
     [Test]
     [Category("Layouts")]
     public void Layouts_CanOverrideCommonUsagesOnExistingLayout()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -29,6 +29,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed DualSense on iOS not inheriting from `DualShockGamepad` ([case 1378308](https://issuetracker.unity3d.com/issues/input-dualsense-detection-ios)).
 - Fixed a device becoming `.current` (e.g. `Gamepad.current`, etc) when sending a new state event that contains no control changes (case 1377952).
 - Fixed calling `IsPressed` on an entire device returning `true` ([case 1374024](https://issuetracker.unity3d.com/issues/inputcontrol-dot-ispressed-always-returns-true-when-using-new-input-system)).
+- Fixed `InputSystem.RegisterLayoutOverride` resulting in the layout that overrides are being applied to losing the connection to its base layout ([case 1377719](https://fogbugz.unity3d.com/f/cases/1377719/)).
 
 #### Actions
 

Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs

@@ -2026,6 +2026,7 @@ public InputControlLayout TryLoadLayout(InternedString name, Dictionary<Interned
                             overrideLayout.isOverride = false;
                             overrideLayout.isGenericTypeOfDevice = layout.isGenericTypeOfDevice;
                             overrideLayout.m_Name = layout.name;
+                            overrideLayout.m_BaseLayouts = layout.m_BaseLayouts;
 
                             layout = overrideLayout;
                             layout.m_AppliedOverrides.Append(overrideName);