fix merge issues

- make sure new and existing files are all using the correct namespaces

Author: vkovec

Assets/com.unity.formats.fbx.tests/FbxExporterReflection.cs

@@ -94,19 +94,19 @@ public static bool ExportMaterial(ModelExporter instance, Material unityMaterial
 
         public static string ExportObjects(string filePath,
                 UnityEngine.Object[] objects = null,
-                EditorTools.IExportOptions exportOptions = null,
+                IExportOptions exportOptions = null,
                 Dictionary<GameObject, IExportData> exportData = null)
         {
             return (string)InvokeMethodOverload("ExportObjects",
                                               new object[] { filePath, objects, exportOptions, exportData },
-                                              new Type[] { typeof(string), typeof(UnityEngine.Object[]), typeof(EditorTools.IExportOptions), typeof(Dictionary<GameObject, IExportData>) });
+                                              new Type[] { typeof(string), typeof(UnityEngine.Object[]), typeof(IExportOptions), typeof(Dictionary<GameObject, IExportData>) });
         }
 
-        public static IExportData GetExportData(GameObject rootObject, AnimationClip animationClip, EditorTools.IExportOptions exportOptions = null)
+        public static IExportData GetExportData(GameObject rootObject, AnimationClip animationClip, IExportOptions exportOptions = null)
         {
             return (IExportData)InvokeMethodOverload("GetExportData",
                                                     new object[] { rootObject, animationClip, exportOptions },
-                                                    new Type[] { typeof(GameObject), typeof(AnimationClip), typeof(EditorTools.IExportOptions) });
+                                                    new Type[] { typeof(GameObject), typeof(AnimationClip), typeof(IExportOptions) });
         }
 
         // Redefinition of the internal delegate. There might be a way to re-use the one in ModelExporter

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

@@ -404,17 +404,16 @@ protected override GameObject GetGameObject()
         {
             return (IsTimelineAnim)
                 ? AnimationOnlyExportData.GetGameObjectAndAnimationClip(ToExport [0]).Key
-                :  ModelExporter.GetGameObject ( ToExport [0] );
+                :  GetGameObject ();
         }
+
         protected override bool DisableTransferAnim {
             get {
                 // don't transfer animation if we are exporting more than one hierarchy, the timeline clips from
                 // a playable director, or if only the model is being exported
                 // if we are on the timeline then export length can be more than 1
                 return ToExport == null || ToExport.Length == 0 || (!IsTimelineAnim && ToExport.Length > 1) || SettingsObject.ModelAnimIncludeOption == ExportSettings.Include.Model;
             }
-
-            }
         }
 
         private bool m_isTimelineAnim = false;