PropertyBinder : Minor Fixes (#29)

Paul Demeulenaere · GitHub Enterprise · commit 733b2270fd0a · 2020-05-18T16:24:14.000+02:00
* Fix for binder when null asset &amp; fix for binder while resetting

* Call ClearPropertyBinders while resetting
diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -97,6 +97,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Avoid NullReferenceException in Previous Position Binder" component. [Case 1242351](https://issuetracker.unity3d.com/product/unity/issues/guid/1242351/)
 - Don't show the blocks window when context cant have blocks
 - Prevent from creating a context in VisualEffectSugraphOperator by draggingfrom an output slot.
+- Avoid NullReferenceException when VisualEffectAsset is null if VFXPropertyBinder [Case 1219061](https://issuetracker.unity3d.com/product/unity/issues/guid/1219061/)
+- Missing Reset function in VFXPropertyBinder [Case 1219063](https://issuetracker.unity3d.com/product/unity/issues/guid/1219063/)
 
 ## [7.1.1] - 2019-09-05
 ### Added
diff --git a/com.unity.visualeffectgraph/Editor/Utilities/PropertyBinding/VFXPropertyBinderEditor.cs b/com.unity.visualeffectgraph/Editor/Utilities/PropertyBinding/VFXPropertyBinderEditor.cs
@@ -126,8 +126,21 @@ private class MenuPropertySetName
 
         public void CheckTypeMenu(SerializedProperty property, VFXPropertyBindingAttribute attribute, VisualEffectAsset asset)
         {
-            GenericMenu menu = new GenericMenu();
-            var parameters = (asset.GetResource().graph as UnityEditor.VFX.VFXGraph).children.OfType<UnityEditor.VFX.VFXParameter>();
+            VFXGraph graph = null;
+            if (asset != null)
+            {
+                var resource = asset.GetResource();
+                if (resource != null) //If VisualEffectGraph is store in asset bundle, we can't use this following code
+                {
+                    graph = resource.graph as VFXGraph;
+                }
+            }
+
+            if (graph == null)
+                return;
+
+            var menu = new GenericMenu();
+            var parameters = graph.children.OfType<UnityEditor.VFX.VFXParameter>();
             foreach (var param in parameters)
             {
                 string typeName = param.type.ToString();
diff --git a/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/VFXPropertyBinder.cs b/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/VFXPropertyBinder.cs
@@ -36,6 +36,14 @@ private void OnEnable()
             m_VisualEffect = GetComponent<VisualEffect>();
         }
 
+        private void Reset()
+        {
+            m_VisualEffect = GetComponent<VisualEffect>();
+            m_Bindings = new List<VFXBinderBase>();
+            m_Bindings.AddRange(gameObject.GetComponents<VFXBinderBase>());
+            ClearPropertyBinders();
+        }
+
         void Update()
         {
             if (!m_ExecuteInEditor && Application.isEditor && !Application.isPlaying) return;

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,14 @@ private void OnEnable()`
`36`	`36`	`m_VisualEffect = GetComponent<VisualEffect>();`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ private void Reset()`
	`40`	`+ {`
	`41`	`+ m_VisualEffect = GetComponent<VisualEffect>();`
	`42`	`+ m_Bindings = new List<VFXBinderBase>();`
	`43`	`+ m_Bindings.AddRange(gameObject.GetComponents<VFXBinderBase>());`
	`44`	`+ ClearPropertyBinders();`
	`45`	`+ }`
	`46`	`+`
`39`	`47`	`void Update()`
`40`	`48`	`{`
`41`	`49`	`if (!m_ExecuteInEditor && Application.isEditor && !Application.isPlaying) return;`