Add handling for implicit boolean conversion operators

- Fix implicit boolean conversion operators that are defined on UnityEngine.Object types
MerlinVR · Mar 6, 2020 · 2c20e9f · 2c20e9f
1 parent eec1a4c
commit 2c20e9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs b/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs
@@ -526,7 +526,7 @@ private SymbolDefinition CastSymbolToType(SymbolDefinition sourceSymbol, System.
 
                 foreach (MethodInfo methodInfo in methods)
                 {
-                    if (methodInfo.ReturnType == targetType && methodInfo.GetParameters()[0].ParameterType == sourceSymbol.symbolCsType)
+                    if (methodInfo.ReturnType == targetType && (methodInfo.GetParameters()[0].ParameterType == sourceSymbol.symbolCsType || methodInfo.GetParameters()[0].ParameterType == typeof(UnityEngine.Object)))
                     {
                         foundConversion = methodInfo;
                         break;

diff --git a/Assets/UdonSharp/Editor/UdonSharpUtils.cs b/Assets/UdonSharp/Editor/UdonSharpUtils.cs
@@ -189,7 +189,7 @@ public static bool IsImplicitlyAssignableFrom(this System.Type targetType, Syste
 
                 foreach (MethodInfo methodInfo in methods)
                 {
-                    if (methodInfo.ReturnType == targetType && methodInfo.GetParameters()[0].ParameterType == assignee)
+                    if (methodInfo.ReturnType == targetType && (methodInfo.GetParameters()[0].ParameterType == assignee || methodInfo.GetParameters()[0].ParameterType == typeof(UnityEngine.Object)))
                         return true;
                 }
             }