[Port] [6000.1] [ShaderGraph]properties bugfixes

Author: svc-reach-platform-support

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs

@@ -182,9 +182,15 @@ void BuildExposedField(PropertySheet propertySheet)
                 propertySheet.Add(toggleDataPropertyDrawer.CreateGUI(
                     evt =>
                     {
+                        if (shaderInput is AbstractShaderProperty property &&
+                            (!property.overrideHLSLDeclaration || property.hlslDeclarationOverride == HLSLDeclaration.DoNotDeclare))
+                        {
+                            property.hlslDeclarationOverride = property.GetDefaultHLSLDeclaration();
+                            property.overrideHLSLDeclaration = true;
+                        }
                         this._preChangeValueCallback("Change Exposed Toggle");
                         this._exposedFieldChangedCallback(evt.isOn);
-                        this._postChangeValueCallback(false, ModificationScope.Graph);
+                        this._postChangeValueCallback(true, ModificationScope.Graph);
                     },
                     new ToggleData(shaderInput.isExposed),
                     shaderInput is ShaderKeyword ? "Generate Material Property" : "Show In Inspector",
@@ -528,8 +534,11 @@ void BuildHLSLDeclarationOverrideFields(PropertySheet propertySheet, AbstractSha
                         property.hlslDeclarationOverride = evt.newValue;
                         property.overrideHLSLDeclaration = true;
                         UpdateEnableState();
-                        this._exposedFieldChangedCallback(evt.newValue != HLSLDeclaration.Global);
-                        property.generatePropertyBlock = evt.newValue != HLSLDeclaration.Global;
+                        if ((evt.newValue == HLSLDeclaration.Global) ^ (evt.previousValue == HLSLDeclaration.Global))
+                        {
+                            this._exposedFieldChangedCallback(evt.newValue != HLSLDeclaration.Global);
+                            property.generatePropertyBlock = evt.newValue != HLSLDeclaration.Global;
+                        }
                         this._postChangeValueCallback(true, ModificationScope.Graph);
                     });
 
@@ -561,7 +570,7 @@ void BuildPrecisionField(PropertySheet propertySheet, AbstractShaderProperty pro
 
         void HandleVector1ShaderProperty(PropertySheet propertySheet, Vector1ShaderProperty vector1ShaderProperty)
         {
-            var floatType = isCurrentPropertyGlobal ? FloatType.Default : vector1ShaderProperty.floatType;
+            var floatType = (isSubGraph || isCurrentPropertyGlobal) ? FloatType.Default : vector1ShaderProperty.floatType;
             // Handle vector 1 mode parameters
             switch (floatType)
             {
@@ -1461,6 +1470,8 @@ void KeywordAddCallbacks()
 
                 if (EditorGUI.EndChangeCheck())
                 {
+                    this._preChangeValueCallback("Edit Enum Keyword Entry");
+
                     displayName = GetSanitizedDisplayName(displayName);
                     referenceName = GetSanitizedReferenceName(displayName.ToUpper());
                     var duplicateIndex = FindDuplicateKeywordReferenceNameIndex(entry.id, referenceName);
@@ -1581,6 +1592,7 @@ void KeywordRemoveEntry(ReorderableList list)
 
         void KeywordReorderEntries(ReorderableList list)
         {
+            this._preChangeValueCallback("Reorder Keyword Entry");
             this._postChangeValueCallback(true);
         }
 
@@ -1640,7 +1652,6 @@ void BuildDropdownFields(PropertySheet propertySheet, ShaderInput shaderInput)
                 return;
 
             BuildDropdownField(propertySheet, dropdown);
-            BuildExposedField(propertySheet);
         }
 
         void BuildDropdownField(PropertySheet propertySheet, ShaderDropdown dropdown)