Merge pull request #6984 from Troy-Ferrell/users/trferrel/dependency-graph-updates

keveleigh · web-flow · commit d8f4071a14f9 · 2020-01-07T13:52:08.000-08:00
Update dependency graph
diff --git a/Assets/MixedRealityToolkit.Tools/DependencyWindow/DependencyWindow.cs b/Assets/MixedRealityToolkit.Tools/DependencyWindow/DependencyWindow.cs
@@ -50,6 +50,7 @@ private class DependencyGraphNode
             ".mat",
             ".anim",
             ".controller",
+            ".playable",
         };
 
         private readonly string[] assetsWithMetaDependencies =
@@ -332,7 +333,6 @@ private void RefreshDependencyGraph()
                 }
 
                 string guid = GetGuidFromMeta(metaFile);
-
                 if (!IsGuidValid(guid))
                 {
                     continue;
@@ -411,7 +411,8 @@ private static bool DoesNodeHaveExtension(DependencyGraphNode node, string[] tar
 
         private static bool IsGuidValid(string guid)
         {
-            return !string.IsNullOrEmpty(guid) && guid != nullGuid;
+            return !string.IsNullOrEmpty(guid) && guid != nullGuid
+            && !string.IsNullOrEmpty(Path.GetExtension(AssetDatabase.GUIDToAssetPath(guid)));
         }
 
         private static string GetGuidFromMeta(string file)

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ private class DependencyGraphNode`
`50`	`50`	`".mat",`
`51`	`51`	`".anim",`
`52`	`52`	`".controller",`
	`53`	`+ ".playable",`
`53`	`54`	`};`
`54`	`55`
`55`	`56`	`private readonly string[] assetsWithMetaDependencies =`
`@@ -332,7 +333,6 @@ private void RefreshDependencyGraph()`
`332`	`333`	`}`
`333`	`334`
`334`	`335`	`string guid = GetGuidFromMeta(metaFile);`
`335`		`-`
`336`	`336`	`if (!IsGuidValid(guid))`
`337`	`337`	`{`
`338`	`338`	`continue;`
`@@ -411,7 +411,8 @@ private static bool DoesNodeHaveExtension(DependencyGraphNode node, string[] tar`
`411`	`411`
`412`	`412`	`private static bool IsGuidValid(string guid)`
`413`	`413`	`{`
`414`		`- return !string.IsNullOrEmpty(guid) && guid != nullGuid;`
	`414`	`+ return !string.IsNullOrEmpty(guid) && guid != nullGuid`
	`415`	`+ && !string.IsNullOrEmpty(Path.GetExtension(AssetDatabase.GUIDToAssetPath(guid)));`
`415`	`416`	`}`
`416`	`417`
`417`	`418`	`private static string GetGuidFromMeta(string file)`