Skip to content

Commit 3050555

Browse files
committed
UNI-40132 code review fixes
- made the changes on this branch to avoid merge conflicts
1 parent ca7d597 commit 3050555

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Assets/FbxExporters/Editor/ConvertToModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ public static GameObject[] CreateInstantiatedModelPrefab (
7777
GameObject [] unityGameObjectsToConvert)
7878
{
7979
var toExport = ModelExporter.RemoveRedundantObjects (unityGameObjectsToConvert);
80-
var wasExported = Enumerable.ToArray (toExport);
81-
ConvertToPrefabEditorWindow.Init (wasExported);
82-
return wasExported;
80+
ConvertToPrefabEditorWindow.Init (toExport);
81+
return toExport.ToArray();
8382
}
8483

8584
/// <summary>

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Editor
1313
public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow
1414
{
1515
protected override GUIContent WindowTitle { get { return new GUIContent ("Convert Options"); }}
16-
protected override float MinWindowHeight { get { return 280; } }
16+
protected override float MinWindowHeight { get { return 280; } } // determined by trial and error
1717
protected override string ExportButtonName { get { return "Convert"; } }
1818
private GameObject[] m_toConvert;
1919
private string m_prefabFileName = "";
@@ -27,7 +27,7 @@ public static void Init (IEnumerable<GameObject> toConvert)
2727
}
2828

2929
protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
30-
m_toConvert = Enumerable.ToArray (toConvert);
30+
m_toConvert = toConvert.OrderBy (go => go.name).ToArray ();
3131

3232
if (m_toConvert.Length == 1) {
3333
m_prefabFileName = m_toConvert [0].name;

0 commit comments

Comments
 (0)