Call recreateCopy after recusion test not before. #52

Author: iTris666

com.unity.visualeffectgraph/CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Subgraphs are not in hardcoded categories anymore : updated default subgraph templates + Samples to add meaningful categories.
 - Enum fields having headers show the header in the inspector as well.
 - Fix incorrect propagation on expression flags [Case 1246738](https://issuetracker.unity3d.com/product/unity/issues/guid/1246738/)
+- fix crash when creating a loop in subgraph operators [Case 1251523](https://issuetracker.unity3d.com/product/unity/issues/guid/1251523/)
 
 ## [7.4.1] - 2020-06-03
 

com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs

@@ -176,16 +176,6 @@ public void PatchInputExpressions()
             VFXSubgraphUtility.TransferExpressionToParameters(inputExpressions, GetParameters(t => VFXSubgraphUtility.InputPredicate(t)).OrderBy(t => t.order));
         }
 
-        protected override void OnInvalidate(VFXModel model, InvalidationCause cause)
-        {
-            if (cause == InvalidationCause.kSettingChanged && (subgraph != null || object.ReferenceEquals(m_Subgraph, null)))
-            {
-                RecreateCopy();
-            }
-
-            base.OnInvalidate(model, cause);
-        }
-
         public VFXModel[] subChildren
         {
             get { return m_SubChildren; }
@@ -252,11 +242,11 @@ protected internal override void Invalidate(VFXModel model, InvalidationCause ca
                 if (graph != null && subgraph != null && m_Subgraph.GetResource() != null)
                 {
                     var otherGraph = m_Subgraph.GetResource().GetOrCreateGraph();
-                    if (otherGraph != m_UsedSubgraph)
-                        RecreateCopy();
                     if (otherGraph == graph || otherGraph.subgraphDependencies.Contains(graph.GetResource().visualEffectObject))
                         m_Subgraph = null; // prevent cyclic dependencies.
-                    if (graph.GetResource().isSubgraph) // BuildSubgraphDependenciesis called for vfx by recompilation, but in subgraph we must call it explicitely
+                    if (otherGraph != m_UsedSubgraph)
+                        RecreateCopy();
+                    if (graph.GetResource().isSubgraph) // BuildSubgraphDependencies is called for vfx by recompilation, but in subgraph we must call it explicitely
                         graph.BuildSubgraphDependencies();
                 }
                 else if (m_UsedSubgraph != null)

com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs

@@ -110,7 +110,7 @@ protected internal override void Invalidate(VFXModel model, InvalidationCause ca
                     var otherGraph = m_Subgraph.GetResource().GetOrCreateGraph();
                     if (otherGraph == graph || otherGraph.subgraphDependencies.Contains(graph.GetResource().visualEffectObject))
                         m_Subgraph = null; // prevent cyclic dependencies.
-                    if (graph.GetResource().isSubgraph) // BuildSubgraphDependenciesis called for vfx by recompilation, but in subgraph we must call it explicitely
+                    if (graph.GetResource().isSubgraph) // BuildSubgraphDependencies is called for vfx by recompilation, but in subgraph we must call it explicitely
                         graph.BuildSubgraphDependencies();
                 }
             }