code review fixes

Author: vkovec

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

@@ -11,24 +11,20 @@ namespace FbxExporter.UnitTests
 {
     public class ConvertToNestedPrefabTest : ExporterTestBase
     {
-        // TestCaseSource requires the input to return IEnumerable
-        public static IEnumerable PrefabTestCases
+        public static string[] PrefabTestCases = new string[]
         {
-            get
-            {
-                yield return "Prefabs/Camera.prefab";
-                yield return "Prefabs/RegularPrefab.prefab";
-                yield return "Prefabs/RegularPrefab_GO.prefab";
-                yield return "Prefabs/RegularPrefab_Model.prefab";
-                yield return "Prefabs/RegularPrefab_Regular.prefab";
-                yield return "Prefabs/RegularPrefab_Variant.prefab";
-                yield return "Prefabs/VariantPrefab.prefab";
-                yield return "Prefabs/VariantPrefab_GO.prefab";
-                yield return "Prefabs/VariantPrefab_Model.prefab";
-                yield return "Prefabs/VariantPrefab_Regular.prefab";
-                yield return "Prefabs/VariantPrefab_Variant.prefab";
-            }
-        }
+            "Prefabs/Camera.prefab",
+            "Prefabs/RegularPrefab.prefab",
+            "Prefabs/RegularPrefab_GO.prefab",
+            "Prefabs/RegularPrefab_Model.prefab",
+            "Prefabs/RegularPrefab_Regular.prefab",
+            "Prefabs/RegularPrefab_Variant.prefab",
+            "Prefabs/VariantPrefab.prefab",
+            "Prefabs/VariantPrefab_GO.prefab",
+            "Prefabs/VariantPrefab_Model.prefab",
+            "Prefabs/VariantPrefab_Regular.prefab",
+            "Prefabs/VariantPrefab_Variant.prefab"
+        };
 
         [Test, TestCaseSource(typeof(ConvertToNestedPrefabTest), "PrefabTestCases")]
         public void TestConversion(string prefabPath)

com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs

@@ -182,6 +182,8 @@ public static GameObject[] CreateInstantiatedModelPrefab(
 
             bool onlyPrefabAssets = ConvertToNestedPrefab.SetContainsOnlyPrefabAssets(unityGameObjectsToConvert);
             int groupIndex = -1;
+            // If only Prefab Assets on disk are selected (nothing in the scene), then do not
+            // try to undo as modifications on disk cannot be undone.
             if (!onlyPrefabAssets)
             {
                 Undo.IncrementCurrentGroup();

com.unity.formats.fbx/Editor/ExportModelEditorWindow.cs

@@ -159,10 +159,10 @@ public void OnPresetSelectionChanged()
         protected bool SelectionContainsPrefabInstanceWithAddedObjects()
         {
             var exportSet = GetToExport();
-            Queue<Object> queue = new Queue<Object>(exportSet);
-            while (queue.Count > 0)
+            Stack<Object> stack = new Stack<Object>(exportSet);
+            while (stack.Count > 0)
             {
-                var go = ModelExporter.GetGameObject(queue.Dequeue());
+                var go = ModelExporter.GetGameObject(stack.Pop());
                 if (!go)
                 {
                     continue;
@@ -175,7 +175,7 @@ protected bool SelectionContainsPrefabInstanceWithAddedObjects()
 
                 foreach (Transform child in go.transform)
                 {
-                    queue.Enqueue(child.gameObject);
+                    stack.Push(child.gameObject);
                 }
             }
             return false;