PR changes.

Author: inwoods

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

@@ -73,7 +73,6 @@ public void GameCameraTest()
             Assert.That( srcCam.nearClipPlane, Is.EqualTo(origCam.nearClipPlane));
         }
 
-        #if UNITY_2018_2_OR_NEWER
         [Test]
         public void PhysicalCameraTest()
         {
@@ -114,7 +113,5 @@ public void PhysicalCameraTest()
             Assert.That( srcCam.nearClipPlane, Is.EqualTo(origCam.nearClipPlane));
             Assert.That( srcCam.farClipPlane, Is.EqualTo(origCam.farClipPlane));
         }
-
-        #endif
     }
 }

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

@@ -6,28 +6,23 @@ namespace FbxExporters
 {
     namespace Visitors
     {
-        public static class CameraVisitor
+        internal static class CameraVisitor
         {
             /// <summary>
             /// Visit Object and configure FbxCamera
             /// </summary>
-            public static FbxNodeAttribute VisitNodeAttribute (UnityEngine.Object unityGo, FbxNodeAttribute fbxNodeAttr)
+            public static void ConfigureCamera (Camera unityCamera, FbxCamera fbxCamera)
             {
-                #if UNITY_2018_2_OR_NEWER
-                Camera unityCamera = unityGo as Camera;
-
-                return unityCamera.usePhysicalProperties 
-                    ? ConfigurePhysicalCamera(fbxNodeAttr as FbxCamera, unityCamera) 
-                        : ConfigureGameCamera(fbxNodeAttr as FbxCamera, unityCamera);
-                #else
-                return ConfigureGameCamera(fbxCamera as FbxCamera, unityGo as Camera);
-                #endif
+                if (unityCamera.usePhysicalProperties) 
+                    ConfigurePhysicalCamera(fbxCamera, unityCamera);
+                else 
+                    ConfigureGameCamera(fbxCamera, unityCamera);
             }
 
             /// <summary>
             /// Configure FbxCameras from GameCamera 
             /// </summary>
-            private static FbxCamera ConfigureGameCamera (FbxCamera fbxCamera, Camera unityCamera)
+            private static void ConfigureGameCamera (FbxCamera fbxCamera, Camera unityCamera)
             {
                 // Configure FilmBack settings as a 35mm TV Projection (0.816 x 0.612)
                 float aspectRatio = unityCamera.aspect;
@@ -58,14 +53,13 @@ private static FbxCamera ConfigureGameCamera (FbxCamera fbxCamera, Camera unityC
                 // FarPlane
                 fbxCamera.SetFarPlane (unityCamera.farClipPlane.Meters().ToCentimeters());
 
-                return fbxCamera;
+                return ;
             }
 
-            #if UNITY_2018_2_OR_NEWER
             /// <summary>
             /// Configure FbxCameras from a Physical Camera 
             /// </summary>
-            private static FbxCamera ConfigurePhysicalCamera (FbxCamera fbxCamera, Camera unityCamera)
+            private static void ConfigurePhysicalCamera (FbxCamera fbxCamera, Camera unityCamera)
             {
                 Debug.Assert(unityCamera.usePhysicalProperties);
 
@@ -109,9 +103,8 @@ private static FbxCamera ConfigurePhysicalCamera (FbxCamera fbxCamera, Camera un
                 // FarPlane
                 fbxCamera.SetFarPlane ((float)unityCamera.farClipPlane.Meters().ToCentimeters());
 
-                return fbxCamera;
+                return ;
             }
-            #endif
         }
     }
 }

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

@@ -18,7 +18,7 @@ namespace Editor
         public class ModelExporter : System.IDisposable
         {
             const string Title =
-                "Created by FBX Exporter from UNITY TECHNOLOGIES";
+                "Created by FBX Exporter from Unity Technologies";
 
             const string Subject =
                 "";
@@ -1283,7 +1283,7 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx
                 return true;
             }
 
-           /// <summary>
+            /// <summary>
             /// Exports camera component
             /// </summary>
             protected bool ExportCamera (GameObject unityGO, FbxScene fbxScene, FbxNode fbxNode)
@@ -1298,7 +1298,9 @@ protected bool ExportCamera (GameObject unityGO, FbxScene fbxScene, FbxNode fbxN
                     return false;
                 }
 
-                fbxNode.SetNodeAttribute (CameraVisitor.VisitNodeAttribute(unityCamera, fbxCamera));
+                CameraVisitor.ConfigureCamera(unityCamera, fbxCamera);
+                
+                fbxNode.SetNodeAttribute (fbxCamera);
 
                 // set +90 post rotation to counteract for FBX camera's facing +X direction by default
                 fbxNode.SetPostRotation(FbxNode.EPivotSet.eSourcePivot, new FbxVector4(0,90,0));