[VFX] Misc subgraph fixes

Misc subgraph fixes:

- Fix a regression (https://jira.unity3d.com/browse/UUM-69798) that prevented blocks to be added to subgraph context.
- Fix https://jira.unity3d.com/browse/UUM-556, not by reenabling compilation for subgraph (which makes no sense as they are not compiled) but by disabling the compile menu. Expected workflow is to save for subgraph dependencies to be recompiled.

Author: julienf-unity

Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs

@@ -75,6 +75,7 @@ protected override void OnOpenPopup()
             bool enableToggles = (!m_VFXView.controller.graph.GetResource()?.isSubgraph) ?? false; // for subgraph we disable auto reinit
 
             m_AutoCompileToggle.value = VFXViewWindow.GetWindowNoShow(m_VFXView).autoCompile;
+            m_AutoCompileToggle.SetEnabled(enableToggles);
 
             m_AutoReinitToggle.value = enableToggles ? VFXViewWindow.GetWindowNoShow(m_VFXView).autoReinit : false;
             m_AutoReinitToggle.SetEnabled(enableToggles);

Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs

@@ -551,6 +551,8 @@ public bool HasCustomAttributeConflicts(IEnumerable<VFXAttribute> customAttribut
         readonly Texture2D m_UnlinkedIcon;
         readonly VFXVCSDropdownButton m_VCSDropDown;
 
+        private VFXCompileDropdownButton m_CompileDropDownButton;
+
         VFXNodeProvider m_NodeProvider;
         bool m_IsRuntimeMode;
         bool m_ForceShaderDebugSymbols;
@@ -619,8 +621,8 @@ public VFXView()
             var saveDropDownButton = new VFXSaveDropdownButton(this);
             m_Toolbar.Add(saveDropDownButton);
 
-            var compileDropDownButton = new VFXCompileDropdownButton(this);
-            m_Toolbar.Add(compileDropDownButton);
+            m_CompileDropDownButton = new VFXCompileDropdownButton(this);
+            m_Toolbar.Add(m_CompileDropDownButton);
 
             m_LinkedIcon = EditorGUIUtility.LoadIcon(Path.Combine(EditorResources.iconsPath, "Linked.png"));
             m_UnlinkedIcon = EditorGUIUtility.LoadIcon(Path.Combine(EditorResources.iconsPath, "UnLinked.png"));
@@ -794,6 +796,7 @@ internal void ToggleShaderValidationChanged()
         private void SetToolbarEnabled(bool enabled)
         {
             ToolbarElementsToDisableWhenNoAsset.ForEach(x => m_Toolbar.Q<VisualElement>(x).SetEnabled(enabled));
+
         }
 
         public void UpdateBadges(IVFXErrorReporter report)
@@ -1290,8 +1293,10 @@ void NewControllerSet()
                 m_NoAssetElement.RemoveFromHierarchy();
                 SetToolbarEnabled(true);
 
-                m_AttachDropDownButton.SetEnabled(this.controller.graph.visualEffectResource.subgraph == null);
-                m_LockToggle.SetEnabled(this.controller.graph.visualEffectResource.subgraph == null);
+                bool isSubGraph = this.controller.model.isSubgraph;
+                m_CompileDropDownButton.SetEnabled(!isSubGraph);
+                m_AttachDropDownButton.SetEnabled(!isSubGraph);
+                m_LockToggle.SetEnabled(!isSubGraph);
 
                 OnFocus();
             }

Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXBlockSubgraphContext.cs

@@ -21,7 +21,7 @@ public enum ContextType
             UpdateAndOutput = Update | Output
         }
 
-        public VFXBlockSubgraphContext() : base(VFXContextType.None, VFXDataType.None, VFXDataType.None)
+        public VFXBlockSubgraphContext() : base(VFXContextType.BlockSubgraph, VFXDataType.None, VFXDataType.None)
         {
         }
 

Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXContext.cs

@@ -24,13 +24,14 @@ enum VFXContextType
         SpawnerGPU = 1 << 6,
         Subgraph = 1 << 7,
         Filter = 1 << 8,
+        BlockSubgraph = 1 << 9,
 
         InitAndUpdate = Init | Update,
         InitAndUpdateAndOutput = Init | Update | Output,
         UpdateAndOutput = Update | Output,
         All = Init | Update | Output | Spawner | Subgraph,
 
-        CanHaveBlocks = ~(OutputEvent | Event | SpawnerGPU),
+        CanHaveBlocks = ~(OutputEvent | Event | SpawnerGPU | Subgraph),
     };
 
     [Flags]