@@ -542,10 +542,8 @@ private void CompareMeshComponentAttributes(Mesh mesh, Mesh fbxMesh)
542
542
}
543
543
544
544
private delegate void SetImportSettings ( ModelImporter importer ) ;
545
- private string ExportSkinnedMesh (
545
+ private ( string filename , SkinnedMeshRenderer originalSkinnedMesh , SkinnedMeshRenderer exportedSkinnedMesh ) ExportSkinnedMesh (
546
546
string fileToExport ,
547
- out SkinnedMeshRenderer originalSkinnedMesh ,
548
- out SkinnedMeshRenderer exportedSkinnedMesh ,
549
547
SetImportSettings setImportSettings = null )
550
548
{
551
549
// change import settings of original FBX
@@ -577,13 +575,13 @@ private string ExportSkinnedMesh(
577
575
GameObject fbxObj = AssetDatabase . LoadMainAssetAtPath ( filename ) as GameObject ;
578
576
Assert . IsTrue ( fbxObj ) ;
579
577
580
- originalSkinnedMesh = originalGO . GetComponentInChildren < SkinnedMeshRenderer > ( ) ;
578
+ var originalSkinnedMesh = originalGO . GetComponentInChildren < SkinnedMeshRenderer > ( ) ;
581
579
Assert . IsNotNull ( originalSkinnedMesh ) ;
582
580
583
- exportedSkinnedMesh = fbxObj . GetComponentInChildren < SkinnedMeshRenderer > ( ) ;
581
+ var exportedSkinnedMesh = fbxObj . GetComponentInChildren < SkinnedMeshRenderer > ( ) ;
584
582
Assert . IsNotNull ( exportedSkinnedMesh ) ;
585
583
586
- return filename ;
584
+ return ( filename , originalSkinnedMesh , exportedSkinnedMesh ) ;
587
585
}
588
586
589
587
public class SkinnedMeshTestDataClass
@@ -622,7 +620,9 @@ public void TestSkinnedMeshes (string fbxPath) {
622
620
Assert . That ( fbxPath , Is . Not . Null ) ;
623
621
624
622
SkinnedMeshRenderer originalSkinnedMesh , exportedSkinnedMesh ;
625
- ExportSkinnedMesh ( fbxPath , out originalSkinnedMesh , out exportedSkinnedMesh ) ;
623
+ var exportResult = ExportSkinnedMesh ( fbxPath ) ;
624
+ originalSkinnedMesh = exportResult . originalSkinnedMesh ;
625
+ exportedSkinnedMesh = exportResult . exportedSkinnedMesh ;
626
626
627
627
Assert . IsTrue ( originalSkinnedMesh . name == exportedSkinnedMesh . name ||
628
628
( originalSkinnedMesh . transform . parent == null && exportedSkinnedMesh . transform . parent == null ) ) ;
@@ -877,7 +877,11 @@ public void TestBlendShapeExport(string fbxPath)
877
877
importer . weldVertices = true ;
878
878
} ;
879
879
880
- var exportedFbxPath = ExportSkinnedMesh ( fbxPath , out originalSMR , out exportedSMR , setImportSettings ) ;
880
+ var exportResult = ExportSkinnedMesh ( fbxPath , setImportSettings ) ;
881
+ var exportedFbxPath = exportResult . filename ;
882
+ originalSMR = exportResult . originalSkinnedMesh ;
883
+ exportedSMR = exportResult . exportedSkinnedMesh ;
884
+
881
885
882
886
var originalMesh = originalSMR . sharedMesh ;
883
887
var exportedMesh = exportedSMR . sharedMesh ;
0 commit comments