Missed renaming of existing inline Vector1 for rename Vector1 to Float (#2159)

* Missed renaming of existing inline Vector1 for rename Vector1 to Float PR

* Rename Vector1 to Float in EnumPopup for custom function

Author: sebastienlagarde

com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs

@@ -46,6 +46,13 @@ public AbstractShaderProperty AsShaderProperty()
             return new Vector1ShaderProperty { value = slot.value };
         }
 
+        public override void OnAfterDeserialize()
+        {
+            base.OnAfterDeserialize();
+
+            name = "Float";
+        }
+
         int IPropertyFromNode.outputSlotId { get { return OutputSlotId; } }
     }
 }

com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs

@@ -46,6 +46,26 @@ enum ConcreteSlotValueType
         VirtualTexture
     }
 
+    // This enum must match ConcreteSlotValueType enum and is used to give friendly name in the enum popup used for custom function
+    enum ConcreteSlotValueTypePopupName
+    {
+        SamplerState = ConcreteSlotValueType.SamplerState,
+        Matrix4 = ConcreteSlotValueType.Matrix4,
+        Matrix3 = ConcreteSlotValueType.Matrix3,
+        Matrix2 = ConcreteSlotValueType.Matrix2,
+        Texture2D = ConcreteSlotValueType.Texture2D,
+        Texture2DArray = ConcreteSlotValueType.Texture2DArray,
+        Texture3D = ConcreteSlotValueType.Texture3D,
+        Cubemap = ConcreteSlotValueType.Cubemap,
+        Gradient = ConcreteSlotValueType.Gradient,
+        Vector4 = ConcreteSlotValueType.Vector4,
+        Vector3 = ConcreteSlotValueType.Vector3,
+        Vector2 = ConcreteSlotValueType.Vector2,
+        Float = ConcreteSlotValueType.Vector1, // This is currently the only renaming we need - rename Vector1 to Float
+        Boolean = ConcreteSlotValueType.Boolean,
+        VirtualTexture = ConcreteSlotValueType.VirtualTexture
+    }
+
     static class SlotValueHelper
     {
         public static bool AllowedAsSubgraphOutput(this ConcreteSlotValueType type)

com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs

@@ -107,7 +107,7 @@ private void AddCallbacks()
                 var concreteValueType = (ConcreteSlotValueType) EditorGUI.EnumPopup(
                     new Rect(rect.x + rect.width / 2, rect.y, rect.width - rect.width / 2, EditorGUIUtility.singleLineHeight),
                     GUIContent.none,
-                    oldSlot.concreteValueType,
+                    (ConcreteSlotValueTypePopupName)oldSlot.concreteValueType, // Force ConcreteSlotValueTypePopupName enum which match ConcreteSlotValueType to provide a friendly named in Popup
                     e => (AllowedTypeCallback == null) ? true : AllowedTypeCallback((ConcreteSlotValueType) e));
 
                 if(EditorGUI.EndChangeCheck())