Skip to content

Commit d483f69

Browse files
authored
Merge pull request #468 from Unity-Technologies/UT-1993-disable-failing-timeline-test-for-release
Ut 1993 disable failing timeline test for release
2 parents ada6ad8 + fedc04e commit d483f69

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

com.unity.formats.fbx.tests/Tests/FbxTests/ExportTimelineClipTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ public override void Init()
1919
EditorSceneManager.OpenScene(FindPathInUnitTests("Scene/TestScene.unity"));
2020
}
2121

22+
#if !UNITY_2019_1_OR_NEWER
23+
[Ignore("UT-1985 CubeSpecialTimeline asset broken in 2018.3")]
24+
#endif
2225
[Test]
2326
public void ExportSingleTimelineClipTest()
2427
{

com.unity.formats.fbx.tests/Tests/FbxTests/ModelExporterTest.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,12 @@ private T ExportComponent<T>(string filename, GameObject obj) where T : Componen
400400
ModelExporter.ExportObject (filename, obj);
401401

402402
var importer = AssetImporter.GetAtPath(filename) as ModelImporter;
403+
#if UNITY_2019_1_OR_NEWER
403404
importer.optimizeMeshPolygons = false;
404405
importer.optimizeMeshVertices = false;
406+
#else
407+
importer.optimizeMesh = false;
408+
#endif // UNITY_2019_1_OR_NEWER
405409
importer.SaveAndReimport();
406410

407411
GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
@@ -550,8 +554,12 @@ private void ExportSkinnedMesh(string fileToExport, out SkinnedMeshRenderer orig
550554
ModelExporter.ExportObject (filename, originalGO);
551555

552556
var importer = AssetImporter.GetAtPath(filename) as ModelImporter;
557+
#if UNITY_2019_1_OR_NEWER
553558
importer.optimizeMeshPolygons = false;
554559
importer.optimizeMeshVertices = false;
560+
#else
561+
importer.optimizeMesh = false;
562+
#endif // UNITY_2019_1_OR_NEWER
555563
importer.SaveAndReimport();
556564

557565
GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;

com.unity.formats.fbx.tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": "tests",
33
"name": "com.unity.formats.fbx.tests",
44
"displayName": "FBX Exporter Tests",
5-
"version": "2.0.0-preview.1",
5+
"version": "2.0.0-preview.2",
66
"unity": "2018.2",
77
"description": "This is not a user-facing package."
88
}

0 commit comments

Comments
 (0)