Fixing PBShape export using FBX Exporter

Author: lopezt-unity

Addons/Fbx.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Linq;
 using UnityEditor.ProBuilder;
+using UnityEditor.ProBuilder.Actions;
 
 namespace UnityEngine.ProBuilder.Addons.FBX
 {
@@ -40,13 +41,6 @@ private static Assembly FbxExporterAssembly
                 }
             }
         }
-        
-        static readonly Type[] k_ProBuilderTypes = new Type[]
-        {
-            typeof(BezierShape),
-            typeof(PolyShape),
-            typeof(Entity)
-        };
 
         static FbxOptions m_FbxOptions = new FbxOptions() {
             quads = true
@@ -71,12 +65,12 @@ static void TryLoadFbxSupport()
             var getMeshForComponent = FbxExporterAssembly.GetTypes()
                .Where(t => t.BaseType == typeof(MulticastDelegate) && t.Name.StartsWith("GetMeshForComponent"))
                .First(t => t.ContainsGenericParameters);
-            
+
             getMeshForComponent = getMeshForComponent.MakeGenericType(typeof(ProBuilderMesh));
             var meshDelegate = Delegate.CreateDelegate(getMeshForComponent, typeof(Fbx).GetMethod("GetMeshForComponent", BindingFlags.NonPublic | BindingFlags.Static));
 
             registerMeshCallback.Invoke(null, new object[] { meshDelegate, true });
-            
+
             m_FbxOptions.quads = ProBuilderSettings.Get<bool>("Export::m_FbxQuads", SettingsScope.User, true);
         }
 
@@ -93,17 +87,17 @@ static bool GetMeshForComponent(object exporter, ProBuilderMesh pmesh, object no
 
             Object.DestroyImmediate(mesh);
 
-            // probuilder can't handle mesh assets that may be externally reloaded, just strip pb stuff for now.
-            foreach (var type in k_ProBuilderTypes)
+            var exporterType = exporter.GetType().GetMethods(BindingFlags.NonPublic | BindingFlags.Instance)
+                .First(x => x.Name == "get_ExportOptions").Invoke(exporter, null).GetType();
+
+            var prefabExporterType = FbxExporterAssembly.GetType("UnityEditor.Formats.Fbx.Exporter.ConvertToPrefabSettingsSerialize");
+
+            if(exporterType == prefabExporterType)
             {
-                var component = pmesh.GetComponent(type);
-                if (component != null)
-                    Object.DestroyImmediate(component);
+                // probuilder can't handle mesh assets that may be externally reloaded, just strip pb stuff for now.
+                StripProBuilderScripts.DoStrip(pmesh);
             }
 
-            pmesh.preserveMeshAssetOnDestroy = true;
-            Object.DestroyImmediate(pmesh);
-
             return true;
         }
     }

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Bug Fixes
 
+- [case: 1334017] Fixed errors while exporting a PBShape using FBX Exporter and cleaning export.
 - [case: 1332226] Fixed issue where some Gizmos menu items would be missing in projects that have ProBuilder package installed.
 - [case: 1324374] Fixed incorrect vertex/edge/face rect selection when mesh's parent is rotated and/or scaled.