Merge pull request #443 from umasteeringgroup/Feature-13

Jaimi · web-flow · commit efc89d36802d · 2024-06-13T20:08:11.000-05:00
Fix for unloaded blendshapes. Speedup Global Library cell draw
diff --git a/UMAProject/Assets/UMA/Core/Editor/Scripts/UMAAssetTreeView.cs b/UMAProject/Assets/UMA/Core/Editor/Scripts/UMAAssetTreeView.cs
@@ -502,7 +502,7 @@ void CellGUI(Rect cellRect, TreeViewItem<AssetTreeElement> item, AssetColumns co
 					*/
 #if UMA_ADDRESSABLES
 
-					if (ai.Item is UMATextRecipe)
+					if (ai._Type == typeof(UMATextRecipe))
 					{
 						UMATextRecipe recipe = ai.Item as UMATextRecipe;
 
diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/SkinnedMeshCombiner.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/SkinnedMeshCombiner.cs
@@ -323,7 +323,7 @@ public static void CombineMeshes(UMAMeshData target, CombineInstance[] sources,
 
                 if (has_blendShapes)
                 {
-                    if (source.meshData.blendShapes != null && source.meshData.blendShapes.Length > 0)
+                    //if (source.meshData.blendShapes != null && source.meshData.blendShapes.Length > 0)
                     {
                         List<UMABlendShape> sourceShapes = GetBlendshapeSources(source.meshData, recipe);
                         int sourceBlendShapeLength = sourceShapes.Count;
diff --git a/UMAProject/Assets/UMA/Examples/HowTo Examples/How to Load and Save a DCA to a string.unity b/UMAProject/Assets/UMA/Examples/HowTo Examples/How to Load and Save a DCA to a string.unity

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ void CellGUI(Rect cellRect, TreeViewItem<AssetTreeElement> item, AssetColumns co`
`502`	`502`	`*/`
`503`	`503`	`#if UMA_ADDRESSABLES`
`504`	`504`
`505`		`- if (ai.Item is UMATextRecipe)`
	`505`	`+ if (ai._Type == typeof(UMATextRecipe))`
`506`	`506`	`{`
`507`	`507`	`UMATextRecipe recipe = ai.Item as UMATextRecipe;`
`508`	`508`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ public static void CombineMeshes(UMAMeshData target, CombineInstance[] sources,`
`323`	`323`
`324`	`324`	`if (has_blendShapes)`
`325`	`325`	`{`
`326`		`- if (source.meshData.blendShapes != null && source.meshData.blendShapes.Length > 0)`
	`326`	`+ //if (source.meshData.blendShapes != null && source.meshData.blendShapes.Length > 0)`
`327`	`327`	`{`
`328`	`328`	`List<UMABlendShape> sourceShapes = GetBlendshapeSources(source.meshData, recipe);`
`329`	`329`	`int sourceBlendShapeLength = sourceShapes.Count;`