Merge branch 'master' into Uni-33810_MAYA_LOCATION_bobsfavouritedrive

Author: inwoods

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -343,7 +343,7 @@ private static HashSet<string> GetCustomVendorLocations()
         {
             HashSet<string> result = new HashSet<string>();
 
-            var environmentVariable = Environment.GetEnvironmentVariable("UNITY_FBX_3DAPP_VENDOR_LOCATIONS");
+            var environmentVariable = Environment.GetEnvironmentVariable("UNITY_3DAPP_VENDOR_LOCATIONS");
 
             if (!string.IsNullOrEmpty(environmentVariable))
             {

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -410,7 +410,7 @@ public void VendorLocationInstallationTest1 ()
         private void VendorLocations_Setup (List<string> paths)
         {
             //Preserve our environment variables for later
-            originalVendorLocation = System.Environment.GetEnvironmentVariable ("UNITY_FBX_3DAPP_VENDOR_LOCATIONS");
+            originalVendorLocation = System.Environment.GetEnvironmentVariable ("UNITY_3DAPP_VENDOR_LOCATIONS");
             originalMayaLocation = System.Environment.GetEnvironmentVariable ("MAYA_LOCATION");
 
             foreach (var pathToExe in paths) {
@@ -429,7 +429,7 @@ private void VendorLocations_Setup (List<string> paths)
         private void VendorLocations_TearDown(List<string> vendorInstallFolders)
         {
             //Put the environment variables back to what they were originally
-            System.Environment.SetEnvironmentVariable("UNITY_FBX_3DAPP_VENDOR_LOCATIONS", originalVendorLocation);
+            System.Environment.SetEnvironmentVariable("UNITY_3DAPP_VENDOR_LOCATIONS", originalVendorLocation);
             System.Environment.SetEnvironmentVariable("MAYA_LOCATION", originalMayaLocation);
 
             //Clean up vendor location(s)
@@ -448,7 +448,7 @@ private void SetEnvironmentVariables (string vendorLocation, string mayaLocation
         {
             if (!string.IsNullOrEmpty (vendorLocation)) {
                 //if the given vendor location isn't null, set the environment variable to it.
-                System.Environment.SetEnvironmentVariable ("UNITY_FBX_3DAPP_VENDOR_LOCATIONS", vendorLocation);
+                System.Environment.SetEnvironmentVariable ("UNITY_3DAPP_VENDOR_LOCATIONS", vendorLocation);
             }
             if (mayaLocationPath != null) {
                 //if the given MAYA_LOCATION isn't null, set the environment variable to it