Add handling for nested type naming

- Fix issue with finding the correct names for nested types. This affected player tracking data and probably particle systems.
MerlinVR · Feb 12, 2020 · 9036bd1 · 9036bd1
1 parent a457359
commit 9036bd1
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/Assets/UdonSharp/Editor/UdonSharpResolverContext.cs b/Assets/UdonSharp/Editor/UdonSharpResolverContext.cs
@@ -272,6 +272,20 @@ public string GetUdonTypeName(System.Type externType)
         {
             string externTypeName = externType.GetNameWithoutGenericArity();
             string typeNamespace = externType.Namespace;
+            if (externType.DeclaringType != null)
+            {
+                string declaringTypeNamespace = "";
+
+                System.Type declaringType = externType.DeclaringType;
+
+                while (declaringType != null)
+                {
+                    declaringTypeNamespace = $"{externType.DeclaringType.Name}.{declaringTypeNamespace}";
+                    declaringType = declaringType.DeclaringType;
+                }
+
+                typeNamespace += $".{declaringTypeNamespace}";
+            }
 
             if (externTypeName == "T" || externTypeName == "T[]")
                 typeNamespace = "";