Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-24636-1.2.0b1-forum-release

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -65,11 +65,7 @@ public override void OnInspectorGUI() {
             EditorGUILayout.SelectableLabel(pathLabel,
                 EditorStyles.textField,
                 GUILayout.MinWidth(SelectableLabelMinWidth),
-                GUILayout.Height(EditorGUIUtility.singleLineHeight));
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal();
-
-            GUILayout.Space(LabelWidth + BrowseButtonOffset);
+                GUILayout.Height(EditorGUIUtility.singleLineHeight));            
 
             if (GUILayout.Button(new GUIContent("...", "Browse to a new location for saving model prefabs"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
             {
@@ -105,6 +101,7 @@ public override void OnInspectorGUI() {
                     }
                 }
             }
+
             GUILayout.EndHorizontal();
 
             EditorGUILayout.Space();
@@ -123,11 +120,6 @@ public override void OnInspectorGUI() {
 
             exportSettings.selectedDCCApp = EditorGUILayout.Popup(exportSettings.selectedDCCApp, options);
 
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal();
-
-            GUILayout.Space(LabelWidth + BrowseButtonOffset);
-
             if (GUILayout.Button(new GUIContent("...", "Browse to a 3D application in a non-default location"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth))) {
                 var ext = "";
                 switch (Application.platform) {

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -349,6 +349,7 @@ public void TestExportCamera(){
             camera.nearClipPlane = 19;
             camera.farClipPlane = 500.6f;
 
+            filename = GetRandomFbxFilePath (); // export to a different file
             fbxCamera = ExportCamera (filename, cameraObj);
             CompareCameraValues (camera, fbxCamera);
             Assert.AreEqual (camera.orthographicSize, fbxCamera.orthographicSize);