Prevent paste of composite parts into bindings

Author: tspiller

Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs

@@ -795,6 +795,10 @@ Type CopyTagToType(string tagName)
             var itemType = CopyTagToType(tag);
             if (location.item is ActionTreeItemBase dropTarget)
             {
+                // Specific case - Composite parts cannot be dropped into Bindings
+                if (location.item is not CompositeBindingTreeItem && tag == k_PartOfCompositeBindingTag)
+                    return;
+
                 if (!dropTarget.GetDropLocation(itemType, location.childIndex, ref array, ref arrayIndex))
                     return;
             }

Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs

@@ -94,12 +94,16 @@ protected override void DrawGeneralProperties()
                     if (m_CompositeParts == null)
                         InitializeCompositePartProperties();
 
-                    var selectedPart = EditorGUILayout.Popup(s_CompositePartAssignmentLabel, m_SelectedCompositePart,
-                        m_CompositePartOptions);
-                    if (selectedPart != m_SelectedCompositePart)
+                    // If m_CompositeParts still null after InitializeCompositePartProperties something went wrong and we can't select
+                    if (m_CompositeParts != null)
                     {
-                        m_SelectedCompositePart = selectedPart;
-                        OnCompositePartAssignmentChanged();
+                        var selectedPart = EditorGUILayout.Popup(s_CompositePartAssignmentLabel, m_SelectedCompositePart,
+                            m_CompositePartOptions);
+                        if (selectedPart != m_SelectedCompositePart)
+                        {
+                            m_SelectedCompositePart = selectedPart;
+                            OnCompositePartAssignmentChanged();
+                        }
                     }
                 }
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs

@@ -266,7 +266,8 @@ public static Command PasteActionsOrBindings(List<IPasteListener> pasteListeners
                         else
                             lastPastedElement = CopyPasteHelper.PasteActionsOrBindingsFromClipboard(state.With(selectedBindingIndex: newIndex >= 0 ? newIndex : state.selectedBindingIndex));
 
-                        lastPastedElement.FindPropertyRelative("m_Action").stringValue = relatedAction.Value.name;
+                        if (lastPastedElement != null)
+                            lastPastedElement.FindPropertyRelative("m_Action").stringValue = relatedAction.Value.name;
                     }
                 }